Merge branch 'dev' of http://192.168.1.43:3000/v2/zd-parents into dev

zd-modules/zd-modules-system/src/main/resources/mapper/system/SysClassMapper.xml

@@ -5,14 +5,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.zd.system.mapper.SysClassMapper">
 
     <resultMap type="com.zd.system.domain.SysClass" id="SysClassResult">
-        <result property="id"    column="id"    />
-        <result property="className"    column="class_name"    />
-        <result property="userId"    column="user_id"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="remark"    column="remark"    />
+        <result property="id" column="id"/>
+        <result property="className" column="class_name"/>
+        <result property="userId" column="user_id"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="remark" column="remark"/>
     </resultMap>
 
     <sql id="selectSysClassVo">

zd-modules/zd-modules-system/src/main/resources/mapper/system/SysLogoConfigMapper.xml

@@ -5,18 +5,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.zd.system.mapper.SysLogoConfigMapper">
 
     <resultMap type="com.zd.system.domain.SysLogoConfig" id="SysLogoConfigResult">
-        <result property="id"    column="id"    />
-        <result property="schoolName"    column="school_name"    />
-        <result property="circularLogo"    column="circular_logo"    />
-        <result property="rectangleLogo"    column="rectangle_logo"    />
-        <result property="signMap"    column="sign_map"    />
-        <result property="videoCover"    column="video_cover"    />
-        <result property="operationGuide"    column="operation_guide"    />
-        <result property="loginBanner"    column="login_banner"    />
-        <result property="homepageBanner"    column="homepage_banner"    />
-        <result property="userType"    column="user_type"    />
-        <result property="smartLock"    column="smart_lock"    />
-        <result property="airBottle"    column="air_bottle"    />
+        <result property="id" column="id"/>
+        <result property="schoolName" column="school_name"/>
+        <result property="circularLogo" column="circular_logo"/>
+        <result property="rectangleLogo" column="rectangle_logo"/>
+        <result property="signMap" column="sign_map"/>
+        <result property="videoCover" column="video_cover"/>
+        <result property="operationGuide" column="operation_guide"/>
+        <result property="loginBanner" column="login_banner"/>
+        <result property="homepageBanner" column="homepage_banner"/>
+        <result property="userType" column="user_type"/>
+        <result property="smartLock" column="smart_lock"/>
+        <result property="airBottle" column="air_bottle"/>
 
     </resultMap>
 

zd-modules/zd-modules-system/src/main/resources/mapper/system/SysMajorMapper.xml

@@ -5,12 +5,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.zd.system.mapper.SysMajorMapper">
 
     <resultMap type="com.zd.system.domain.SysMajor" id="SysMajorResult">
-        <result property="id"    column="id"    />
-        <result property="majorName"    column="major_name"    />
-        <result property="majorCode"    column="major_code"    />
-        <result property="deptId"    column="dept_id"    />
-        <result property="deptName"    column="dept_name"    />
-        <result property="createTime"    column="create_time"    />
+        <result property="id" column="id"/>
+        <result property="majorName" column="major_name"/>
+        <result property="majorCode" column="major_code"/>
+        <result property="deptId" column="dept_id"/>
+        <result property="deptName" column="dept_name"/>
+        <result property="createTime" column="create_time"/>
     </resultMap>
 
     <sql id="selectSysMajorVo">

zd-modules/zd-modules-system/src/main/resources/mapper/system/SysPermitMenuMapper.xml

@@ -11,15 +11,11 @@
         <result property="userId" column="user_id"/>
         <result property="type" column="type"/>
         <result property="dataScope" column="data_scope"/>
-
         <result property="parentId" column="parent_id"/>
         <result property="menuType" column="menu_type"/>
-
         <result property="deptIdsList" column="deptIdsList"/>
-
         <collection property="deptIds" column="id" ofType="list"
                     select="com.zd.system.mapper.SysPermitMenuDeptMapper.selectDeptIdsByPermitMenuId"/>
-
     </resultMap>
 
     <resultMap type="com.zd.model.entity.SysPermitInfo" id="SysPermitInfo">
@@ -27,7 +23,6 @@
         <result property="menuId" column="menu_id"/>
         <result property="dataScope" column="data_scope"/>
         <result property="menuPerms" column="menuPerms"/>
-
         <collection property="deptIds" column="id" ofType="list"
                     select="com.zd.system.mapper.SysPermitMenuDeptMapper.selectDeptIdsByPermitMenuId"/>
     </resultMap>