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

closeOrPassFollow

Browse Source
This commit is contained in:
苏竹红
2023-06-20 22:16:54 +08:00
parent a95912347f
commit cc935459c7
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml
View File

@@ -451,8 +451,8 @@
hpli.development_manager as developmentManager, hpli.development_manager as developmentManager,
hpli.line_status as lineStatus, hpli.line_status as lineStatus,
hpli.update_time as updateTime, hpli.update_time as updateTime,
hpii.want_shop_area as wantShopArea, hpuinfo.want_shop_area as wantShopArea,
hpii.accept_adjust_type as acceptAdjustType, hpuinfo.accept_adjust_type as acceptAdjustType,
hpuinfo.username as partnerUserName, hpuinfo.username as partnerUserName,
hpuinfo.mobile as partnerUserPhone, hpuinfo.mobile as partnerUserPhone,
hpuinfo.shop_name as storeName, hpuinfo.shop_name as storeName,

6
coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java
View File

@@ -346,8 +346,10 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
privateSeaLineListVo.setLineId(x.getLineId()); privateSeaLineListVo.setLineId(x.getLineId());
privateSeaLineListVo.setLineStatus(x.getLineStatus()); privateSeaLineListVo.setLineStatus(x.getLineStatus());
privateSeaLineListVo.setPartnerId(x.getPartnerId()); privateSeaLineListVo.setPartnerId(x.getPartnerId());
privateSeaLineListVo.setWorkflowStatus(x.getWorkflowStatus());
privateSeaLineListVo.setDeadline(x.getDeadline()); privateSeaLineListVo.setDeadline(x.getDeadline());
privateSeaLineListVo.setPartnerUserPhone(x.getPartnerUserPhone()); privateSeaLineListVo.setPartnerUserPhone(x.getPartnerUserPhone());
privateSeaLineListVo.setPartnerUserName(x.getPartnerUserName());
privateSeaLineListVo.setAcceptAdjustType(x.getAcceptAdjustType()); privateSeaLineListVo.setAcceptAdjustType(x.getAcceptAdjustType());
privateSeaLineListVo.setInvestmentManagerName(x.getInvestmentManager()); privateSeaLineListVo.setInvestmentManagerName(x.getInvestmentManager());
privateSeaLineListVo.setDevelopmentManager(x.getDevelopmentManager()); privateSeaLineListVo.setDevelopmentManager(x.getDevelopmentManager());
@@ -355,7 +357,11 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
privateSeaLineListVo.setStoreCode(x.getStoreCode()); privateSeaLineListVo.setStoreCode(x.getStoreCode());
privateSeaLineListVo.setStoreName(x.getStoreName()); privateSeaLineListVo.setStoreName(x.getStoreName());
privateSeaLineListVo.setUpdateTime(x.getUpdateTime()); privateSeaLineListVo.setUpdateTime(x.getUpdateTime());
privateSeaLineListVo.setDeadline(x.getDeadline());
privateSeaLineListVo.setRecommendPartnerId(x.getRecommendPartnerId()); privateSeaLineListVo.setRecommendPartnerId(x.getRecommendPartnerId());
privateSeaLineListVo.setAcceptAdjustType(x.getAcceptAdjustType());
privateSeaLineListVo.setWantShopArea(x.getWantShopArea());
privateSeaLineListVo.setInvestmentManager(x.getInvestmentManager());
privateSeaLineListVo.setRecommendPartnerName(x.getRecommendPartnerName()); privateSeaLineListVo.setRecommendPartnerName(x.getRecommendPartnerName());
privateSeaLineListVo.setWorkflowStage(x.getWorkflowStage()); privateSeaLineListVo.setWorkflowStage(x.getWorkflowStage());
privateSeaLineListVo.setWantShopArea(x.getWantShopArea()); privateSeaLineListVo.setWantShopArea(x.getWantShopArea());