Merge remote-tracking branch 'origin/master'

luodangjia

2024-11-06 7e5a51f911b7f65b6c37e232b69dc18c6fb6a066

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

@@ -89,4 +89,10 @@
    @TableField("city_str")
    private String cityStr;

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

}