Merge remote-tracking branch 'origin/cc_20250325_select' into cc_20250325_select
# Conflicts: # coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java
This commit is contained in:
@@ -89,6 +89,11 @@ enterprise.dingCorpId=wpayJeDAAAklx_q1jGhyGUd4yEh8vV_g
|
||||
qywx.task.notice.url2=https://store-h5.coolstore.cn/?corpId=%s&appType=%s#/notice?target=%s¬iceType=zx&corpId=%s&appType=%s&eid=%s
|
||||
|
||||
|
||||
xgj.open.organization.X-key = 2677a58dd9e24fc6b20e835ef5f19e63
|
||||
xgj.open.organization.X-Secret = 3fe724f9607448728ee3393eff75718a
|
||||
xgj.open.organization.url = https://masterdata.zhengxinfood.com/dmp/one-id
|
||||
|
||||
|
||||
|
||||
api.auth.url=https://api.zhengxindzg.cn
|
||||
api.auth.username=GkqgAhUJ7p9swJo
|
||||
|
||||
Reference in New Issue
Block a user