合并冲突

CODE/smart-community/app-api/src/main/java/com/community/huiju/model/TpTransaction.java

 
     private List<String> imgList;
 
+    private  Integer roleId;
+
+    public Integer getRoleId() {
+        return roleId;
+    }
+    public void setRoleId(Integer roleId) {
+        this.roleId = roleId;
+    }
     public Integer getId() {
         return id;
     }

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/FaceServicelimpl.java

 
              /*推送海康*/
             String data=HKOpenApi.HKpersonGroupId(uploadFile, user.getHkUserId(), user.getId(), user.getUserName(), user.getHkCardNo());
+
               /*boolean isA为true进行添加，为false进行修改*/
             if (0 == type && 1 == faceNum) {
                 if (null == data) {

CODE/smart-community/app-api/src/main/resources/mapper/TpTransactionMapper.xml

     <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
     <result column="update_user" property="updateUser" jdbcType="INTEGER" />
     <result column="update_date" property="updateDate" jdbcType="TIMESTAMP" />
+    <result column="role_id" property="roleId" jdbcType="INTEGER" />
   </resultMap>
   <sql id="Base_Column_List" >
     id, community_id, ta_user_id, transaction_title, transaction_content,
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select 
-    <include refid="Base_Column_List" />
+     id,
+     community_id,
+     ta_user_id,
+     transaction_title,
+     transaction_content,
+     view_count,
+     status,
+     type,
+     create_user,
+     create_date,
+     update_user,
+     update_date,
+    (SELECT role_id FROM ta_sys_user_role WHERE user_id=ta_user_id) AS role_id
     from tp_transaction
-    where id = #{id,jdbcType=INTEGER} and #{communityId,jdbcType=INTEGER}
+    where id = #{id,jdbcType=INTEGER} and community_id=#{communityId,jdbcType=INTEGER}
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
     delete from tp_transaction