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

Merge branch 'master' into dev/feat/partner1.4_20231009

Browse Source 
# Conflicts:
#	coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerIntentInfoDAO.java
#	coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerIntentInfoMapper.java
#	coolstore-partner-dao/src/main/resources/mapper/HyPartnerIntentInfoMapper.xml
#	coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerIntentInfoDO.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/FlowServiceImpl.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java
This commit is contained in:
俞扬
2023-09-19 10:34:52 +08:00
parent a0f5235863 9be4748a97
commit 95bfeab0bc
15 changed files with 410 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
coolstore-partner-common/src/main/java/com/cool/store/constants/RedisConstant.java
View File

@@ -243,6 +243,15 @@ public class RedisConstant {
*/
public static final String MDM_AREA_OTHERS = "mdm:area:others:{0}";
/**
* MDM 所属大区缓存
*/
public static final String MDM_BELONG_REGION = "mdm:belongRegion";
/**
* MDM 业务区域缓存
*/
public static final String MDM_BUSINESS_REGION = "mdm:businessRegion";
/**
* 动态标题