-
Merge pull request !701 from wanwan/feature/crm
-
# Conflicts: # sql/mysql/crm.sql
-
Merge pull request !695 from wanwan/feature/crm
-
Merge pull request !691 from zyna/feature/crm
-
2、商机状态类型和商机状态字段的处理；
-
# Conflicts: # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/api/coupon/CouponTemplateApiImpl.java
-
Merge pull request !694 from puhui999/feature/mall_product
