suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
shuo.wang
2024-10-13 14:48:32 +08:00
parent f68373d568 f409bff0b7
commit 0b714a79d7
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coolstore-partner-model/src/main/java/com/cool/store/vo/shop/ShopStageInfoVO.java
View File

@@ -76,7 +76,7 @@ public class ShopStageInfoVO {
AuditInfoVO auditInfoVO = AuditInfoVO.convertVO(auditInfo);
shopStageInfo.setAuditInfo(auditInfoVO);
shopStageInfo.setPlanCompleteTime(stageInfo.getPlanCompleteTime());
shopStageInfo.setActualCompleteTime(CoolDateUtils.parseStrToStr(CoolDateUtils.DATE_FORMAT_SEC,CoolDateUtils.DATE_FORMAT_SEC1,stageInfo.getActualCompleteTime()));
shopStageInfo.setActualCompleteTime(CoolDateUtils.parseStrToStr(CoolDateUtils.DATE_FORMAT_SEC1,CoolDateUtils.DATE_FORMAT_SEC,stageInfo.getActualCompleteTime()));
resultList.add(shopStageInfo);
}
return resultList;

1
coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java
View File

@@ -493,6 +493,7 @@ public class DecorationServiceImpl implements DecorationService {
fitmentCheckVO.setLineId(lineId);
fitmentCheckVO.setShopName(shopInfo.getShopName());
fitmentCheckVO.setStoreNum(shopInfo.getStoreNum());
fitmentCheckVO.setShopCode(shopInfo.getShopCode());
fitmentCheckVO.setPartnerName(lineInfo.getUsername());
fitmentCheckVO.setRegionId(regionId);
fitmentCheckVO.setRegion(regionName);