Merge remote-tracking branch 'origin/feature-201823-wangcz' into feature-201823-wangcz

src/main/java/com/uas/platform/b2c/prod/store/facade/impl/StoreInFacadeImpl.java

@@ -61,14 +61,12 @@ public class StoreInFacadeImpl implements StoreInFacade {
 		if (store == null) {
 			return new ResultMap(CodeType.ERROR_STATE, String.format("编号%s对应的店铺不存在", uuid));
 		}
-//		store.setEnterpriseJson(newStoreInfo.getEnterpriseJson());
-//		store.setEnterprise(newStoreInfo.getEnterprise());
 		ResultMap resultMap = setStoreInfoByKind(store, newStoreInfo, kind);
 		if (resultMap != null) {
 			return resultMap;
 		}
 		StoreIn storeIn = storeInDao.findByStoreName(newStoreInfo.getStoreName());
-		if (!StringUtils.isEmpty(storeIn)) {
+		if (!StringUtils.isEmpty(storeIn) && !StringUtils.isEmpty(newStoreInfo.getEnterprise())) {
 			if (!storeIn.getEnUU().equals(newStoreInfo.getEnterprise().getUu())) {
 				return new ResultMap(CodeType.NOT_PERMIT, "该名称店铺名称已经存在，请您更换一个店铺名称进行更改");
 			}