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

无关风月

3 天以前 7e92d9c7f76777c48f76376c99ffaae2e16fe7ed

 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;

}