Commit b59a98c2 authored by ddl's avatar ddl

merge

parent 69ccb76b
{ {
<<<<<<< HEAD
"requires": true,
"lockfileVersion": 1,
=======
"name": "qk_wx_miniprogram", "name": "qk_wx_miniprogram",
"version": "1.0.0", "version": "1.0.0",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
>>>>>>> feature/ddl
"dependencies": { "dependencies": {
"@vant/weapp": { "@vant/weapp": {
"version": "1.10.14", "version": "1.10.14",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment