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

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

@@ -526,6 +526,7 @@ public class DepartmentApiServiceImpl implements DepartmentApiService {
 					dto.setParentDepartmentId(pId);
 					dto.setChainId(chainId);
 					dto.setChainName(chainName);
+					dto.setSort(departmentDTO.getOrder());
 					dto.setIsStore(0);
 					this.departmentService.add(dto);
 				}

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

@@ -96,6 +96,7 @@ public class StoreController extends WebBaseController{
 					StoreDTO storeDTO = storeService.getStore(dto.getRelatedId());
 					if(storeDTO != null ){
 						VO.setEnterpriseId(storeDTO.getEnterpriseId());
+						VO.setStoreImg(storeDTO.getImageUrl());//先置空
 					}
 				}
 				VO.setCreateTime(dto.getCreateTime());