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

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

@@ -444,7 +444,7 @@
         from tab_haoban_external_clerk_related
         where staff_id = #{staffId,jdbcType=VARCHAR}
         and wx_enterprise_id = #{wxEnterpriseId}
-        <!-- and enterprise_id = #{enterpriseId} -->
+        and enterprise_id = #{enterpriseId} 
         and external_user_id = #{externalUserId}
         and status_flag in(1,3,4)
         order by update_time desc limit 1