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

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

@@ -179,7 +179,7 @@
     </delete>
 
     <select id="listByWxEnterpriseIdAndDeptList"
-            resultType="com.gic.haoban.manage.service.entity.TabHaobanWelcomeSuitRang">
+            resultMap="TabHaobanWelcomeSuitRangMap">
         select welcome_suit_rang_id,
         wx_enterprise_id,
         welcome_id,