Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev

疯狂的狮子Li

2022-05-28 5ced7e05f592ba23f585fc5a2b43ea8695ac0ff8

 ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java

@@ -47,7 +47,7 @@
     */
    @ApiModelProperty(value = "显示顺序")
    @NotNull(message = "显示顺序不能为空")
    private Long orderNum;
    private Integer orderNum;

    /**
     * 负责人