Commit Graph

6430 Commits

Author SHA1 Message Date
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
xingyu4j
1e65b2219d perf 2022-11-17 17:32:50 +08:00
xingyu4j
91113eac18 revert: remove aotu components 2022-11-17 17:18:48 +08:00
xingyu4j
ed3170e837 Revert "perf: add aotu components"
This reverts commit 3e1ce8b76a.
2022-11-17 17:11:41 +08:00
xingyu4j
a13cb8698d Revert "perf: add aotu components"
This reverts commit 763e9c1297.
2022-11-17 17:11:36 +08:00
xingyu4j
410d5eb7a3 Revert "perf: style"
This reverts commit 931a02a40b.
2022-11-17 17:11:27 +08:00
xingyu4j
8bc6d6b5c2 Revert "perf: aotu components"
This reverts commit daa9d01adf.
2022-11-17 17:11:24 +08:00
xingyu4j
fe3fd184f9 Revert "style: crontab"
This reverts commit 7225150e0e.
2022-11-17 17:11:21 +08:00
xingyu4j
905385d4ae Revert "perf: crud"
This reverts commit 0b23ce416e.
2022-11-17 17:11:18 +08:00
xingyu4j
998d23db61 Revert "fix: refreshToken"
This reverts commit 34d8954469.
2022-11-17 17:10:42 +08:00
xingyu4j
0b23ce416e perf: crud 2022-11-17 16:39:18 +08:00
xingyu4j
7225150e0e style: crontab 2022-11-17 16:25:05 +08:00
xingyu4j
daa9d01adf perf: aotu components 2022-11-17 16:02:24 +08:00
xingyu4j
931a02a40b perf: style 2022-11-17 15:41:13 +08:00
xingyu4j
a4a524ba38 fix: dict 2022-11-17 15:05:51 +08:00
xingyu4j
763e9c1297 perf: add aotu components 2022-11-17 15:03:13 +08:00
xingyu4j
3e1ce8b76a perf: add aotu components 2022-11-17 14:52:31 +08:00
xingyu4j
cbb6a37924 Merge remote-tracking branch 'origin/master' into feature/vue3 2022-11-17 13:54:48 +08:00
xingyu4j
34d8954469 fix: refreshToken 2022-11-17 13:45:09 +08:00
xingyu4j
e175486692 perf: form inputnumber 2022-11-17 13:31:27 +08:00
xingyu4j
08656ee070 fix: form inputnumber 2022-11-17 13:27:26 +08:00
xingyu4j
f606bfb12b fix: inputnumber 2022-11-17 13:20:55 +08:00
xingyu4j
2de05a87f4 chore: update 1.8.5 2022-11-17 13:14:27 +08:00
xingyu4j
d4d6f667aa fix: dictType edit 2022-11-17 11:24:51 +08:00
xingyu4j
d0167b3f48 chore: update devs 2022-11-17 10:59:46 +08:00