BJ_ZTEITS-Developers / parking-cloud-yudao

Merge pull request !810 from puhui999/develop

Merge pull request !817 from zyna/develop

# Conflicts:
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/article/AppArticleController.java

# Conflicts:
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerServiceImpl.java

# Conflicts:
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contact/CrmContactBusinessLinkServiceImpl.java

Merge pull request !806 from puhui999/develop

# Conflicts:
#	yudao-server/src/main/resources/application-local.yaml