Merge branch 'master' into master-任务组

陈昶聿

9 天以前 521959e291147717c8b0258dbf6a076e4b04d8cd

 ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java

@@ -56,6 +56,8 @@

    private String orgid;

    private String orgname;

    private String campusid;

    private Integer pageNum;