ab

2023-10-05 00:55:03 +08:00
parent 631bbf4569 86554b9ce9
commit 799c4e93fd
339 changed files with 14628 additions and 594 deletions
--- a/config/base_setting.py
+++ b/config/base_setting.py
@@ -44,7 +44,12 @@ UPLOAD = {

 APP = {
    # 'domain':'http://106.52.204.179:8999'
+<<<<<<< HEAD
       'domain':'https://python815.cn'
+=======
+
+
+>>>>>>> 86554b9ce9fff07f8fcb5b67a271976c08d3b684

 }

@@ -61,4 +66,4 @@ PAY_STATUS_DISPLAY_MAPPING = {
    "-7":"待发货",
    "-6":"待确认",
    "-5":"待评价"
-}
+}