Merge branch 'developer' of http://115.159.76.241/haoban3.0/haoban-manage3.0.git into developer

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

@@ -240,7 +240,7 @@
     where parent_department_id = #{parentId,jdbcType=VARCHAR}
     and status_flag = 1
     and recycle_flag != 1
-    order by sort asc
+    order by sort desc
   </select>
   
   <select id="selectMaxSort" resultType="java.lang.Integer" parameterType="java.lang.String" >
@@ -285,7 +285,7 @@
      <if test="storeFlag != null">
     	and is_store = #{storeFlag}
     </if>
-    order by sort asc
+    order by sort desc
   </select>
   
   <select id="listByDepartmentIds" resultMap="BaseResultMap"  >
@@ -300,7 +300,7 @@
 	      #{id,jdbcType=VARCHAR}
 	    </foreach>
     </if>
-    order by create_time 
+    order by sort desc
   </select>
   
   <select id="listStoreByWxEnterpriseId" resultMap="BaseResultMap"  >
@@ -399,7 +399,7 @@
      <if test="keyword != null and keyword != ''">
     	and (department_name like CONCAT('%',#{keyword},'%') or wx_department_id like CONCAT('%',#{keyword},'%'))
     </if>
-     order by sort asc
+     order by sort desc
   </select>
   
   

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/WxEnterpriseController.java

@@ -82,7 +82,6 @@ public class WxEnterpriseController extends WebBaseController{
 			return resultResponse(HaoBanErrCode.ERR_1);
 		}
 		EnterpriseAndUserDTO dto = enterpriseService.getEnterpriseAndUserByName(enterpriseName);
-		dto.setPhoneNumber("15055988053");
 		return resultResponse(HaoBanErrCode.ERR_1,dto);
  
 	}