You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
owen cddeb37289 Merge remote-tracking branch 'origin/feature/mall_product' into brokerate
# Conflicts:
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/brokerage/record/BrokerageRecordConvert.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/brokerage/user/BrokerageUserConvert.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/record/BrokerageRecordServiceImpl.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/user/BrokerageUserServiceImpl.java
2 years ago
..
optional 售后日志添加售前售后状态 2 years ago
brokerage.sql trade: 分销业务后台功能:推广订单列表 2 years ago
pay_wallet.sql 钱包 review 修改 2 years ago
ruoyi-vue-pro.sql 同步 v1.8.1 SQL 脚本 2 years ago