Merge branch 'feature_0711' into developer

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

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

@@ -511,7 +511,7 @@
     <select id="listByWxEnterpriseId" resultMap="BaseResultMap" parameterType="java.lang.String">
         select
         <include refid="Base_Column_List"/>
-        from tab_haoban_staff
+        from where tab_haoban_staff
         wx_enterprise_id = #{wxEnterpriseId}
         and status_flag = 1
     </select>