Merge remote-tracking branch 'origin/master'

picc-admin-server/src/main/java/com/jpsoft/picc/modules/base/controller/InsuranceDefinitionController.java

@@ -220,4 +220,19 @@ public class InsuranceDefinitionController {
 
         return msgResult;
     }
+
+
+    @ApiOperation(value="所有险种列表")
+    @RequestMapping(value = "list",method = RequestMethod.POST)
+    public MessageResult<List<InsuranceDefinition>> list(){
+
+        MessageResult<List<InsuranceDefinition>> msgResult = new MessageResult<>();
+
+        List<InsuranceDefinition> list = insuranceDefinitionService.list();
+
+        msgResult.setResult(true);
+        msgResult.setData(list);
+
+        return msgResult;
+    }
 }

picc-admin-server/src/main/java/com/jpsoft/picc/modules/base/controller/InsuranceDefinitionLimitController.java

@@ -1,6 +1,7 @@
 package com.jpsoft.picc.modules.base.controller;
 
 import com.github.pagehelper.Page;
+import com.jpsoft.picc.modules.base.entity.InsuranceDefinition;
 import com.jpsoft.picc.modules.base.entity.InsuranceDefinitionLimit;
 import com.jpsoft.picc.modules.common.utils.PojoUtils;
 import com.jpsoft.picc.modules.common.dto.Sort;

picc-admin-server/src/main/resources/mapper/sys/Role.xml

@@ -5,7 +5,7 @@
 <mapper namespace="com.jpsoft.picc.modules.sys.dao.RoleDAO">
     <resultMap id="RoleMap" type="com.jpsoft.picc.modules.sys.entity.Role">
         <id property="id" column="id_"/>
-        <result property="userName" column="name_"/>
+        <result property="name" column="name_"/>
         <result property="description" column="description_"/>
         <result property="createTime" column="create_time"/>
         <result property="updateTime" column="update_time"/>
@@ -25,7 +25,7 @@
 		values
 		(
             #{id,jdbcType=VARCHAR}
-            ,#{userName,jdbcType=VARCHAR}
+            ,#{name,jdbcType=VARCHAR}
             ,#{description,jdbcType=VARCHAR}
             ,#{createTime,jdbcType= TIMESTAMP }
             ,#{updateTime,jdbcType= TIMESTAMP }
@@ -41,8 +41,8 @@
     <update id="update" parameterType="com.jpsoft.picc.modules.sys.entity.Role">
         update sys_role
         <set>
-            <if test="userName!=null">
-                name_=#{userName,jdbcType=VARCHAR},
+            <if test="name!=null">
+                name_=#{name,jdbcType=VARCHAR},
             </if>
             <if test="description!=null">
                 description_=#{description,jdbcType=VARCHAR},