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

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

@@ -105,7 +105,7 @@ public class WxEnterpriseController extends WebBaseController{
 	//溢出门店列表
 	@IgnoreLogin
 	@RequestMapping("store-full-list")
-	public HaobanResponse storeFullList(BasePageInfo basePageInfo,String search) {
+	public HaobanResponse storeFullList(BasePageInfo basePageInfo,String keyWord) {
 		LoginVO login = (LoginVO) AuthRequestUtil.getSessionUser();
 		String wxEnterpriseId = login.getWxEnterpriseId();
 //		String wxEnterpriseId = "1";
@@ -121,14 +121,14 @@ public class WxEnterpriseController extends WebBaseController{
 		page1.setPageSize(Integer.MAX_VALUE);
 		StoreSearchDTO storeSearchDTO = new StoreSearchDTO();
 		storeSearchDTO.setEnterpriseIdList(enterpriseIds);
-		storeSearchDTO.setSearchName(search);
+		storeSearchDTO.setSearchName(keyWord);
 		Page storePage = storeService.storeListPage(page1, storeSearchDTO);
 		if(storePage == null || storePage.getResult()==null){
 			return resultResponse(HaoBanErrCode.ERR_10009);
 		}
 		List<StoreDTO> t_list = storePage.getResult();
 		List<String> storeIds = t_list.stream().map(s->s.getStoreId()).collect(Collectors.toList());
-		Page<DepartmentDTO> page = departmentApiService.pageFullStoreByWxEnterpriseId(wxEnterpriseId, search,storeIds,maxVersionCount, basePageInfo);
+		Page<DepartmentDTO> page = departmentApiService.pageFullStoreByWxEnterpriseId(wxEnterpriseId, keyWord,storeIds,maxVersionCount, basePageInfo);
 		List<DepartmentDTO> list = page.getResult();
 		List<StoreVo> resultList = EntityUtil.changeEntityListByJSON(StoreVo.class,list);
 		

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/StoreVo.java

@@ -17,7 +17,14 @@ public class StoreVo implements Serializable {
     private String storeId;
     private String storeCode;
     private String relatedId;
-    
+    private String wxDepartmentId;
+
+	public String getWxDepartmentId() {
+		return wxDepartmentId;
+	}
+	public void setWxDepartmentId(String wxDepartmentId) {
+		this.wxDepartmentId = wxDepartmentId;
+	}
 	public String getRelatedId() {
 		return relatedId;
 	}