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

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

@@ -154,7 +154,10 @@ public class AuditApiServiceImpl implements AuditApiService{
 		if(!StoreFieldEnum.STORE_IMAG.getValue().equals(changeField)){
 			 //非门店图片修改
 			logger.info("===================进222");
-			getStoreDTO( store, changeField, oldValue, newValue);
+			StoreDTO newStore = new StoreDTO();
+			newStore.setStoreId(store.getStoreId());
+			getStoreDTO( newStore, changeField, oldValue, newValue);
+			
 			StoreDetailDTO detailDTO = EntityUtil.changeEntityByJSON(StoreDetailDTO.class, store);
 			storeService.saveStore(detailDTO);
 //			storeService.saveOrUpdateStore(store);