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

无关风月

2025-04-29 3f62a93a0b0d64984cf070d0ca307a55faf95085

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

@@ -28,7 +28,9 @@

    @TableId(value = "id",type = IdType.AUTO)
    private Integer id;

    @TableField("terminal_code")
    @ApiModelProperty("终端编号")
    private String terminalCode;
    @ApiModelProperty("服务城市")
    @TableField("city")
    private String city;