fix

virgo.api/src/main/java/com/bosshand/virgo/api/model/Merchant.java

@@ -42,6 +42,11 @@ public class Merchant {
      */
     private String registeredCapital;
 
+    /**
+     * 状态
+     */
+    private Integer status;
+
     /**
      * 自定义字段
      */
@@ -111,6 +116,8 @@ public class Merchant {
         this.registeredCapital = registeredCapital;
     }
 
+
+
     public String getData() {
         return data;
     }

virgo.api/src/main/resources/mapper/MerchantMapper.xml

@@ -13,12 +13,13 @@
         <result column="establishDate" property="establishDate"/>
         <result column="businessTerm" property="businessTerm"/>
         <result column="registeredCapital" property="registeredCapital"/>
+        <result column="status" property="status"/>
         <result column="data" property="data"/>
     </resultMap>
 
     <insert id="insert" parameterType="com.bosshand.virgo.api.model.Merchant" useGeneratedKeys="true" keyProperty="id">
-        INSERT INTO merchant(`organizationId`, `industryType`, `name`, `legalPerson`, `establishDate`, `businessTerm`, `registeredCapital`, `data`)
-        VALUES (#{organizationId}, #{industryType}, #{name}, #{legalPerson}, #{establishDate}, #{businessTerm}, #{registeredCapital}, #{data})
+        INSERT INTO merchant(`organizationId`, `industryType`, `name`, `legalPerson`, `establishDate`, `businessTerm`, `registeredCapital`, `status`, `data`)
+        VALUES (#{organizationId}, #{industryType}, #{name}, #{legalPerson}, #{establishDate}, #{businessTerm}, #{registeredCapital}, #{status}, #{data})
     </insert>
 
     <delete id="delete">
@@ -35,6 +36,7 @@
             <if test="establishDate!=null">establishDate=#{establishDate},</if>
             <if test="businessTerm!=null">businessTerm=#{businessTerm},</if>
             <if test="registeredCapital!=null">registeredCapital=#{registeredCapital},</if>
+            <if test="status!=null">status=#{status},</if>
             <if test="data!=null">data=#{data},</if>
         </trim>
         WHERE id=#{id}
@@ -54,6 +56,7 @@
             <if test="establishDate!=null">and establishDate=#{establishDate}</if>
             <if test="businessTerm!=null">and businessTerm=#{businessTerm}</if>
             <if test="registeredCapital!=null">and registeredCapital=#{registeredCapital}</if>
+            <if test="status!=null">and status=#{status}</if>
             <if test="data!=null">and data=#{data},</if>
         </where>
     </select>
@@ -68,6 +71,7 @@
             <if test="establishDate!=null">and establishDate=#{establishDate}</if>
             <if test="businessTerm!=null">and businessTerm=#{businessTerm}</if>
             <if test="registeredCapital!=null">and registeredCapital=#{registeredCapital}</if>
+            <if test="status!=null">and status=#{status}</if>
             <if test="data!=null">and data=#{data},</if>
         </where>
     </select>
@@ -82,6 +86,7 @@
             <if test="p.establishDate!=null">and establishDate=#{p.establishDate}</if>
             <if test="p.businessTerm!=null">and businessTerm=#{p.businessTerm}</if>
             <if test="p.registeredCapital!=null">and registeredCapital=#{p.registeredCapital}</if>
+            <if test="p.status!=null">and status=#{p.status}</if>
             <if test="p.data!=null">and data=#{p.data},</if>
         </where>
         limit #{currIndex} , #{pageSize}