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 
# Conflicts:
#	coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java
This commit is contained in:
苏竹红
2025-04-11 16:14:42 +08:00
parent 42d81b1043 773813c269
commit 6b058db1b5
12 changed files with 249 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
coolstore-partner-web/src/main/resources/application-test.properties
View File

@@ -121,3 +121,7 @@ xzg.api.auth.secret=****
cool.api.appKey=k8J7fG2qR5tY9vX3
cool.api.secret=wP4sN6dL8zK2xM9c
xgj.open.organization.X-key = 2677a58dd9e24fc6b20e835ef5f19e63
xgj.open.organization.X-Secret = 3fe724f9607448728ee3393eff75718a
xgj.open.organization.url = http://117.139.13.24:11180/dmp/one-id