Merge branch 'develop'

cms-common/cms-common-model/src/main/java/com/mmc/iuav/user/model/vo/UserPartnerVO.java

@@ -35,6 +35,7 @@ public class UserPartnerVO {
     private Integer status;
 
     private Integer userAccountId;
-
+    @ApiModelProperty(value = "意向")
+    private String intention;
 
 }

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/entity/UserPartnerDO.java

@@ -46,6 +46,8 @@ public class UserPartnerDO implements Serializable {
     @JsonIgnore
     private Integer userAccountId;
 
+    @ApiModelProperty(value = "意向")
+    private String intention;
 
 }
 

csm-service/cms-service-user/src/main/resources/mapper/UserPartnerDao.xml

@@ -82,15 +82,16 @@
                id,
                create_time,
                update_time,
-               status
+               status,
+               intention
         from user_partner
         where id = #{id}
     </select>
 
     <!--新增所有列-->
     <insert id="insertPartner" keyProperty="id" useGeneratedKeys="true">
-        insert into user_partner(user_address, user_name, phone_number, create_time, update_time, status,user_account_id)
-        values (#{userAddress}, #{userName}, #{phoneNumber},NOW(), #{updateTime}, #{status},#{userAccountId})
+        insert into user_partner(user_address, user_name, phone_number, create_time, update_time, status,user_account_id,intention)
+        values (#{userAddress}, #{userName}, #{phoneNumber},NOW(), #{updateTime}, #{status},#{userAccountId},#{intention})
     </insert>
 
     <insert id="insertBatch" keyProperty="id" useGeneratedKeys="true">