合并冲突

6 months ago · aee5ea0b70
parent 17b5e3a71d
commit aee5ea0b70
1 changed files with 0 additions and 3 deletions
--- a/config.js
+++ b/config.js
@ -18,9 +18,6 @@ export default {
   */
  // storeId: 10001,
 	storeId: 10045,
  storeId: wx.getExtConfigSync().store_id? wx.getExtConfigSync().store_id : 10048,
 >>>>>>> main
  // storeId: 10037,