Merge branch 'master' into master-任务组

陈昶聿

19 小时以前 6e3d0a2097a4d841e941a84ec54780a67eb60ba1

 ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java

@@ -35,6 +35,11 @@
    private String orgid;

    /**
     * 院区
     */
    private String campusid;

    /**
     * 部门ID
     */
    private String deptId;