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

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

Browse Source
This commit is contained in:
苏竹红
2025-04-17 17:46:26 +08:00
parent 53578e81cd 593d4fce77
commit 3ba25c9d16
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coolstore-partner-common/src/main/java/com/cool/store/enums/UserRoleEnum.java
View File

@@ -52,7 +52,7 @@ public enum UserRoleEnum {
LOGISTICS(430000000L,"物流"),
HEAD_OF_DIVISION(40000000L,"分部负责人"),
PRESIDENT(1715882476902L,"总裁"),
VICE_PRESIDENT_IN_CHARGE(440000000L,"分管副总裁")
VICE_PRESIDENT_IN_CHARGE(1715331371325L,"分管副总裁")
;
private Long code;

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

@@ -103,6 +103,7 @@ public class BuildInformationServiceImpl implements BuildInformationService {
if (Objects.nonNull(warehouseInfoDO)) {
response.setDeclareGoodsLogisticsWarehouseName(warehouseInfoDO.getWarehouseName());
}
response.setDeclareGoodsType(orderSysInfoDO.getDeclareGoodsType());
}
if (Objects.nonNull(pointInfo)) {
if (StringUtils.isBlank(response.getAddresseeProvince())){