Commit 7f1f521b authored by wangdong1's avatar wangdong1

add:merge master

parents 62f53468 db29e6b7
...@@ -6,4 +6,6 @@ goods=4000000 ...@@ -6,4 +6,6 @@ goods=4000000
order=5000000 order=5000000
pay=6000000 pay=6000000
account=7000000 account=7000000
wallet=8000000 wallet=8000000
\ No newline at end of file coupon=9000000
shqc=10000000
\ No newline at end of file
This diff is collapsed.
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