Merge remote-tracking branch 'origin/master'

luodangjia

2024-11-06 d6ef18f23c4b298cb9b977ab3a5d65e2f4a39fe2

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

@@ -92,5 +92,7 @@
    @ApiModelProperty("对应城市code")
    @TableField("city_code")
    private String cityCode;
    @TableField(exist = false)
    private String lacation;

}