BJ_ZTEITS-Developers / parking-cloud-yudao

Merge pull request !840 from puhui999/develop

Merge pull request !832 from puhui999/develop

Merge pull request !833 from 安浩浩/develop

Merge pull request !829 from Minh-X/develop

Merge pull request !831 from dhb52/crm-msg

Merge pull request !822 from 疯狂的世界/develop

Merge pull request !828 from 鲜de芒果/develop

# Conflicts:
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/convert/customer/CrmCustomerConvert.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/clue/CrmClueServiceImpl.java

Merge pull request !826 from 安浩浩/develop

# Conflicts:
#	yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/category/ProductCategoryServiceImplTest.java