Merge remote-tracking branch 'origin/master_xgh_停用功能' into developer

Conflicts:
	haoban-manage3-service/src/main/resources/mapper/TabHaobanStaffClerkRelationMapper.xml

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/ExternalClerkRelatedServiceImpl.java

@@ -86,7 +86,7 @@ public class ExternalClerkRelatedServiceImpl implements ExternalClerkRelatedServ
         }
 
         String staffId = tabHaobanStaffs.get(0).getStaffId();
-        List<TabHaobanStaffClerkRelation> tabHaobanStaffClerkRelations = staffClerkRelationMapper.lisByStaffId(wxEnterpriseId, staffId);
+        List<TabHaobanStaffClerkRelation> tabHaobanStaffClerkRelations = staffClerkRelationMapper.lisByStaffId(wxEnterpriseId, staffId,null);
         if (CollectionUtils.isEmpty(tabHaobanStaffClerkRelations)) {
             logger.error("找不到员工导购关联关系:staffId:{}，wxEnterpriseId：{}", staffId, wxEnterpriseId);
             return;

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

@@ -274,8 +274,6 @@
         and wx_user_id = #{wxUserId}
     </select>
 
-   
-
     <select id="getByCodeAndStoreId" resultMap="BaseResultMap" parameterType="java.lang.String">
         select
         <include refid="Base_Column_List"/>