Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
# Conflicts: # yudao-server/src/main/resources/application-test.yamlpull/2/head^2
commit
867bd43b21
|
@ -240,5 +240,5 @@ wx:
|
||||||
database: 16 # 数据库索引
|
database: 16 # 数据库索引
|
||||||
password: 20221122@dev # 密码,建议生产环境开启
|
password: 20221122@dev # 密码,建议生产环境开启
|
||||||
phone:
|
phone:
|
||||||
query-url: http://phone.cyywl.top/cyywl-phone-query-api/
|
query-url: http://cy-phone-bill-inquiry-server:4006/cyywl-phone-query-api/
|
||||||
token: eyIwLnR5cCI6IkpXVCIsImFsZyI6IkhTNTEyIn0
|
token: eyIwLnR5cCI6IkpXVCIsImFsZyI6IkhTNTEyIn0
|
|
@ -223,5 +223,5 @@ wx:
|
||||||
database: 16 # 数据库索引
|
database: 16 # 数据库索引
|
||||||
password: 20221122@dev # 密码,建议生产环境开启
|
password: 20221122@dev # 密码,建议生产环境开启
|
||||||
phone:
|
phone:
|
||||||
query-url: http://phone.cyywl.top/cyywl-phone-query-api/
|
query-url: http://192.168.1.94:4006/cyywl-phone-query-api/
|
||||||
token: eyIwLnR5cCI6IkpXVCIsImFsZyI6IkhTNTEyIn0
|
token: eyIwLnR5cCI6IkpXVCIsImFsZyI6IkhTNTEyIn0
|
Loading…
Reference in New Issue