Merge branch 'master_xgh_bug_11月' into 'developer'

会员合并

See merge request !391

haoban-manage3-service/src/main/resources/mapper/TabHaobanExternalClerkRelatedMapper.xml

@@ -551,10 +551,9 @@
         UPDATE
             tab_haoban_external_clerk_related
         SET member_id=#{memberId},
-            status_flag = 1,
             update_time = now()
         where member_id = #{oldMemberId}
-          and enterprise_id = #{enterpriseId}
+          and enterprise_id = #{enterpriseId} and status_flag = 1
     </update>
 
     <update id="updateStatusByMemberId">