Commit Graph

3618 Commits

Author SHA1 Message Date
xingyu4j
33fbe43ff6 fix: 修复Search组件无法默认值 2022-11-21 16:34:38 +08:00
xingyu4j
dfb24dda81 chore: update 2022-11-21 16:09:44 +08:00
xingyu4j
fd4bc8ccf4 refactor: vxe 2022-11-21 15:27:06 +08:00
zy
65ba4b6ae0 fix:claimTime 转换时也加时区设置,并进行非空判断 2022-11-21 13:34:22 +08:00
xingyu4j
dcd1b5fbba perf: user 2022-11-21 11:21:15 +08:00
xingyu4j
4fc342c0a7 fix: 新增用户 2022-11-21 11:15:10 +08:00
zy
ab164d93f0 fix:流程代办,日期时区转换错误 2022-11-21 10:15:06 +08:00
xingyu4j
144488cb74 Merge remote-tracking branch 'origin/master' into feature/vue3 2022-11-21 09:15:32 +08:00
YunaiV
64df5ce5f4 trade:【交易售后】增加会员取消售后 2022-11-20 23:07:14 +08:00
YunaiV
ed9c8d4a78 trade:【交易售后】增加售后日志 2022-11-20 22:54:30 +08:00
plimlips
453669c7d9
解决新建订单时,订单Id使用使用了address Id的问题
Signed-off-by: plimlips <156839224@qq.com>
2022-11-20 14:18:13 +00:00
plimlips
19a6fc79a2
调用获取地址参数顺序错误
Signed-off-by: plimlips <156839224@qq.com>
2022-11-20 12:05:18 +00:00
芋道源码
dbf237a1f3
修复 Swagger 注解错误,导致文档 404 问题
Signed-off-by: 芋道源码 <zhijiantianya@gmail.com>
2022-11-20 09:28:30 +00:00
YunaiV
d884303df6 trade:【交易售后】查询分页列表 2022-11-20 09:35:06 +08:00
YunaiV
8f6c37755c Merge remote-tracking branch 'origin/feature/1.8.0-uniapp' into feature/1.8.0-uniapp 2022-11-20 01:05:13 +08:00
YunaiV
00e66216c5 trade:【交易售后】查询分页列表的前端 2022-11-20 01:05:03 +08:00
sfmind
dc3e353a80 Merge remote-tracking branch 'origin/feature/1.8.0-uniapp' into feature/1.8.0-uniapp 2022-11-19 21:40:45 +08:00
sfmind
dbf2597d3b 重构页面抽取组件 2022-11-19 21:40:26 +08:00
YunaiV
35528e8267 trade:【交易售后】查询分页列表 2022-11-19 20:43:59 +08:00
sfmind
987c0218fa 删除多余无用文件 2022-11-19 20:38:56 +08:00
sfmind
fb097f7a5b uView版本升级到2.0.34 2022-11-19 20:38:24 +08:00
芋道源码
277cbce58f
!303 fix:加入异步注解配置后redis消费者不能正常消费
Merge pull request !303 from zy_2021/master
2022-11-19 10:50:28 +00:00
YunaiV
73b92190c6 trade:【交易售后】增加申请售后的单元测试 2022-11-19 14:34:59 +08:00
YunaiV
af71a19241 trade:【商品】sku 表增加 spu_name 字段,冗余 2022-11-19 12:25:53 +08:00
YunaiV
964f8cb35b Merge branch 'feature/1.8.0-uniapp' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp 2022-11-19 12:25:29 +08:00
YunaiV
e95402ab92 trade:【交易订单】调整交易订单的 afterSale 字段 2022-11-19 09:18:19 +08:00
LAPTOP-CNV4CMCJ\cheng
b3cea2d4bf Merge branch 'feature/1.8.0-uniapp' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp 2022-11-19 00:40:19 +08:00
LAPTOP-CNV4CMCJ\cheng
78ae018320 新增退款列表页 调整商品列表页的tab切换 2022-11-19 00:40:13 +08:00
xingyu4j
f158d4c6ad perf: vxe height 2022-11-18 18:06:57 +08:00
xingyu4j
aaab618493 feat: add vxe renderer 2022-11-18 17:26:04 +08:00
xingyu4j
b081bb8e71 chore: devs 2022-11-18 17:25:37 +08:00
xingyu4j
2e30dd03e2 fix: dept 2022-11-18 11:20:29 +08:00
xingyu4j
bb48e93ed2 perf: top action slost 2022-11-18 10:54:10 +08:00
zy
9b667448ea fix: 加入异步注解配置后redis消费者不能正常消费 2022-11-18 09:51:19 +08:00
xingyu4j
d5f95c2efe docs: docs 2022-11-18 09:20:11 +08:00
YunaiV
cd2bc112cc trade:【交易售后】完善发起、同意、不同意、收货、拒绝收货、退款的逻辑 2022-11-18 00:28:41 +08:00
xingyu
85253e307c fix: todo 2022-11-18 00:19:00 +08:00
xingyu
095ced7af0 fix: todo 2022-11-18 00:18:20 +08:00
xingyu
de6fc54626 fix: todo 2022-11-17 23:45:47 +08:00
xingyu
8c5b330cc8 fix: todo 2022-11-17 23:27:19 +08:00
xingyu
7df72c4d85 fix 2022-11-17 23:24:50 +08:00
xingyu
3bb8a10393 Merge branch 'feature/vue3' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/vue3 2022-11-17 23:09:34 +08:00
xingyu
6291a3d7d8 refactor: dictData ==> dictClass 2022-11-17 23:09:29 +08:00
xingyu
5725d4862b perf: dept 2022-11-17 23:05:39 +08:00
xingyu
bc97bd30a0 perf: tree table 2022-11-17 22:55:09 +08:00
YunaiV
32986ca284 Merge remote-tracking branch 'origin/feature/vue3' into feature/vue3 2022-11-17 20:56:10 +08:00
YunaiV
f390f1b1e6 vue3:review notice.data.ts 2022-11-17 20:56:00 +08:00
xingyu
5d4673ac00 fix: deptTree 2022-11-17 20:36:02 +08:00
xingyu
7cabf0ead5 feat: dept vxe table 2022-11-17 20:20:09 +08:00
xingyu4j
83954241ae style: 切换页面布局 2022-11-17 17:49:19 +08:00