融合代码提交本地

2018-03-28 08:42:32 +08:00
parent 91bad82aa4
commit 379d1e9011
18 changed files with 354 additions and 139 deletions
--- a/src/main/java/com/nis/web/dao/basics/ServiceDictInfoDao.xml
+++ b/src/main/java/com/nis/web/dao/basics/ServiceDictInfoDao.xml
@@ -29,6 +29,11 @@
 		<result property="loginId" column="login_id"/>
 		<result property="name" column="name"/>
 	    </association>
+	    <!-- 子集合 -->
+	    <collection property="childrenList" javaType="com.nis.domain.basics.ServiceDictInfo">
+	     <id column="service_dict_id" property="serviceDictId" jdbcType="INTEGER" />
+         <result column="item_type" property="itemType" jdbcType="INTEGER" />
+	    </collection>
  </resultMap>
  <resultMap id="dictResultSimpleMap" type="com.nis.domain.basics.ServiceDictInfo" >
    <id column="service_dict_id" property="serviceDictId" jdbcType="INTEGER" />