合并冲突

version/0412
wangdong 7 months ago
parent 17b5e3a71d
commit aee5ea0b70
  1. 3
      config.js

@ -18,9 +18,6 @@ export default {
*/ */
// storeId: 10001, // storeId: 10001,
storeId: 10045, storeId: 10045,
storeId: wx.getExtConfigSync().store_id? wx.getExtConfigSync().store_id : 10048,
>>>>>>> main
// storeId: 10037, // storeId: 10037,

Loading…
Cancel
Save