Bladeren bron

Fix merge issue

tags/江西版6.1.0
Stormeye Wu 6 jaren geleden
bovenliggende
commit
31d9ad561d
1 gewijzigde bestanden met toevoegingen van 0 en 9 verwijderingen
  1. +0
    -9
      ext.json

+ 0
- 9
ext.json Bestand weergeven

@@ -7,7 +7,6 @@
"etcpVersion": "release", "etcpVersion": "release",
"etcpCallbackUrl": "https://ciformall.youlane.cn/api/carCallback/etcpPaidCallback", "etcpCallbackUrl": "https://ciformall.youlane.cn/api/carCallback/etcpPaidCallback",
"ifHaveWebSocket": "0", "ifHaveWebSocket": "0",
<<<<<<< HEAD
"ifHaveCarModular": "1", "ifHaveCarModular": "1",
"imgProxy": [ "imgProxy": [
{ {
@@ -23,14 +22,6 @@
"newUrl": "https://ciformall.youlane.cn/img2" "newUrl": "https://ciformall.youlane.cn/img2"
} }
] ]
=======
"ifHaveCarModular": "1",
"imgOrgUrl": "https://iformall-net.s3.cn-northwest-1.amazonaws.com.cn",
"imgOrgUrl2": "https://wx.qlogo.cn",
"imgOrgUrl1": "https://s3.cn-northwest-1.amazonaws.com.cn",
"imgNewUrl": "https://ciformall.youlane.cn/img",
"imgNewUrl1": "https://ciformall.youlane.cn/img1"
>>>>>>> [小程序生成海报][修改]
}, },
"name": "富茂客官开发", "name": "富茂客官开发",
"weappId": "wxea71200db93d756b", "weappId": "wxea71200db93d756b",


Laden…
Annuleren
Opslaan