From 1668fe1b912d07191c9fd7f20808d7d2162bc8e8 Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期一, 21 四月 2025 17:09:53 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev --- ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/entity/WorkerProcess.java | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/entity/WorkerProcess.java b/ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/entity/WorkerProcess.java index fd175ba..3ac0eb6 100644 --- a/ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/entity/WorkerProcess.java +++ b/ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/entity/WorkerProcess.java @@ -34,6 +34,8 @@ @TableField("city") @NotBlank(message = "请选择:服务城市") private String city; + @TableField("city_code") + private String cityCode; @ApiModelProperty("真实姓名") @TableField("real_name") @@ -85,11 +87,15 @@ private Integer state; @ApiModelProperty("审批意见") - @TableField("examine_opinion") - private String examineOpinion; + @TableField("opinion") + private String opinion; + + @ApiModelProperty("管辖城市二维数组") + @TableField("city_str") + private String cityStr; @ApiModelProperty("手机验证码") @TableField(exist = false) - private String phoneCode; + private String code; } -- Gitblit v1.7.1