Merge remote-tracking branch 'origin/dev' into dev

无关风月

3 天以前 7e92d9c7f76777c48f76376c99ffaae2e16fe7ed

 ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/WorkerProcess.java

@@ -85,4 +85,8 @@
    @TableField("city_str")
    private String cityStr;

    @ApiModelProperty("对应城市code")
    @TableField("city_code")
    private String cityCode;

}