Merge remote-tracking branch 'origin/master'

# Conflicts: # yuan ma/mp-shop/pages/buy/buy.js
3 days ago · 166115169b
parent 0bb767b01a 127e54895f
commit 166115169b
1 changed files with 1 additions and 1 deletions
--- a/ma/mp-shop/pages/buy/buy.js
+++ b/ma/mp-shop/pages/buy/buy.js
@ -1,4 +1,4 @@
-const { getBuy } = require("../../api/index.js")//商品购买
+const { getBuy } = require("../../api/index.js")

 Page({
    data: {