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

无关风月

2 天以前 3044a637a15e09d50ad733fd482c6e64e90df2f9

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

@@ -47,4 +47,8 @@
    @TableField(exist = false)
    private String serveName;

    @ApiModelProperty("服务类型")
    @TableField(exist = false)
    private Integer type;

}