BJ_ZTEITS-Developers / parking-cloud-yudao

…nto feature/mall_product

 Conflicts:
	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/coupon/CouponService.java
	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/coupon/CouponServiceImpl.java
	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderConvert.java
	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java

Merge pull request !602 from 疯狂的世界/mall_coupon_take

Merge pull request !597 from 疯狂的世界/owen_dev

Merge pull request !600 from puhui999/feature/mall_product

This reverts commit 716727bfa7ebcfb0f298e0f805f06efd4d54f695.

Merge pull request !595 from puhui999/feature/mall_product