BJ_ZTEITS-Developers / parking-cloud-yudao

Merge pull request !676 from 疯狂的世界/feature/mall_product

…-pro into feature/mall_product

Merge pull request !678 from puhui999/feature/mall_product

…-pro into feature/mall_product

# Conflicts:
#	sql/mysql/mall.sql

…-pro into feature/mall_product

Merge pull request !672 from 疯狂的世界/feature/mall_product

# Conflicts:
#	sql/mysql/statistics.sql

…vue-pro into feature/mall_product

Merge pull request !668 from puhui999/feature/mall_product

# Conflicts:
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/article/ArticleController.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/article/vo/article/ArticleExcelVO.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/article/vo/article/ArticleExportReqVO.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/convert/article/ArticleConvert.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/article/ArticleMapper.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/article/ArticleService.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/article/ArticleServiceImpl.java
#	yudao-module-mall/yudao-module-promotion-biz/src/test/java/cn/iocoder/yudao/module/promotion/service/article/ArticleServiceImplTest.java

Merge pull request !669 from 疯狂的世界/feature/mall_product

2. 订单、会员注册记录来源终端