Merge branch 'master' into Bulbasaur

This commit is contained in:
lifenlong
2021-05-21 17:25:15 +08:00
38 changed files with 422 additions and 242 deletions

View File

@@ -146,6 +146,7 @@ ignored:
- /buyer/promotion/pointsGoods/**
- /buyer/memberEvaluation/**/goodsEvaluation
- /buyer/memberEvaluation/**/evaluationNumber
- /buyer/appVersion/**
- /store/login/**
- /manager/user/login
- /manager/user/refresh/**