From 0cbb1c4bc98c29e5ca73961d040a0ec1ca4333ac Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期二, 22 四月 2025 09:07:53 +0800 Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/JiaDianHuiShou into dev --- ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/WorkerProcess.java | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/WorkerProcess.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/WorkerProcess.java index b985c0c..e1d95fc 100644 --- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/WorkerProcess.java +++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/WorkerProcess.java @@ -78,7 +78,15 @@ private Integer state; @ApiModelProperty("审批意见") - @TableField("examine_opinion") - private String examineOpinion; + @TableField("opinion") + private String opinion; + + @ApiModelProperty("管辖城市二维数组") + @TableField("city_str") + private String cityStr; + + @ApiModelProperty("对应城市code") + @TableField("city_code") + private String cityCode; } -- Gitblit v1.7.1