Merge remote-tracking branch 'origin/developer' into developer

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/StaffClerkRelationDTO.java

@@ -149,6 +149,9 @@ public class StaffClerkRelationDTO implements Serializable {
     }
 
     public Integer getOpenConcatFlag() {
+        if(null == openConcatFlag) {
+            return 0 ;
+        }
         return openConcatFlag;
     }
 

haoban-manage3-service/src/main/resources/mapper/hm/WxUserAddLogMapper.xml

@@ -160,7 +160,7 @@
 			  <if test="null != createTime">
 			  	 create_time = #{createTime} ,
 			  </if>
-			  update_time=now()
+			  update_time=now()  WHERE 
 		  log_id = external_userid=#{} and staff_id=#{staffId} and membre_id is null 
 	</update>