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		2023-09-10 23:56:00 +08:00
..
optional	售后日志添加售前售后状态	2023-08-30 10:58:37 +08:00
brokerage.sql	trade: 分销业务后台功能：推广订单列表	2023-09-10 23:30:43 +08:00
pay_wallet.sql	钱包 review 修改	2023-09-09 18:32:53 +08:00
ruoyi-vue-pro.sql	同步 v1.8.1 SQL 脚本	2023-09-03 19:15:18 +08:00