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

无关风月

9 天以前 f135f2c8c08b16ac25a4e8e0398418ab3ce1e620

 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;