Merge branch 'master' into master-任务组

陈昶聿

8 天以前 dbdd6dd8934575741a4816cf3af3493b014d3305

 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;