-
# Conflicts: # yudao-module-member/yudao-module-member-biz/pom.xml
-
1.合并积分模块只member module 2.初始化sql放入mysql/member_point.sql 3.添加会员中/会员积分、会员签到/xxx层级目录 4.删除无用的接口代码
-
1、完善商品评论列表的 mock
-
1、增加 article mock 接口
-
1、调整收获地址的返回
-
1、mock 优惠劵模版分页 2、mock 批量删除收藏
-
…vue-pro into feature/mall_product Conflicts: yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/aftersale/vo/AppTradeAfterSaleCreateReqVO.java
-
Merge pull request !519 from 矿泉水/feature/mall_product
-
Merge pull request !522 from puhui999/feature/mall_product
-
…pro into mall_product # Conflicts: # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/vo/TradeOrderBaseVO.java
-
# Conflicts: # yudao-framework/yudao-spring-boot-starter-biz-trade/pom.xml # yudao-module-mall/yudao-module-trade-biz/pom.xml # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/aftersale/TradeAfterSaleServiceImpl.java # yudao-server/pom.xml