Skip to content

M
midjourney-proxy
Commit 6abda072 by 裴大威
Options

解决冲突

parents b1e6eed1 ddf73574
Showing with 8 additions and 4 deletions
pcloud-common-config/src/main/resources.prod/public_system.properties
...@@ -108,4 +108,6 @@ adviser.product.search.excluding.supermerchants = 1000022269,1000022270 ...@@ -108,4 +108,6 @@ adviser.product.search.excluding.supermerchants = 1000022269,1000022270
our_manager_account_id = 2 our_manager_account_id = 2
group.luck.url = https://app.5rs.me/luck/W23/C2/A0/groupluck group.luck.url = https://app.5rs.me/luck/W23/C2/A0/groupluck
\ No newline at end of file
manage_official_id = 22
pcloud-common-config/src/main/resources.uat/public_system.properties
...@@ -110,4 +110,8 @@ adviser.product.search.excluding.supermerchants = 7,1000233 ...@@ -110,4 +110,8 @@ adviser.product.search.excluding.supermerchants = 7,1000233
our_manager_account_id = 12829 our_manager_account_id = 12829
group.luck.url = https://app10035515.raysyun.com/luck/W35515/C35515/A0/groupluck
\ No newline at end of file group.luck.url = https://app10035515.raysyun.com/luck/W35515/C35515/A0/groupluck
manage_official_id = 22
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment