Commit Graph

4197 Commits

Author SHA1 Message Date
YunaiV
59f0e75cba Merge remote-tracking branch 'origin/dev' into dev 2022-11-11 00:28:47 +08:00
YunaiV
83295a10aa 1. 修复 SmsSendServiceTest 单测的报错 2022-11-11 00:28:40 +08:00
芋道源码
e51dda6b68
!281 fix WXLitePayClient.java 中copy应忽略的字段
Merge pull request !281 from chenlei65368/N/A
2022-11-10 14:37:26 +00:00
芋道源码
15dd67d647
!287 fix:(同步失败,不存在改变)代码生成,修改字段注解都不能修改
Merge pull request !287 from halfninety/master
2022-11-10 14:33:19 +00:00
芋道源码
62a6a993a8
!284 bugfix: 当修改保存模型,再发布时,提示"流程定义部署失败,原因:信息未发生变化"
Merge pull request !284 from SuperHao/N/A
2022-11-10 14:31:11 +00:00
芋道源码
5a3823fb79
!280 短信接收报告回调处理小Bug
Merge pull request !280 from Macro/N/A
2022-11-10 13:17:32 +00:00
芋道源码
c022755ec5
!278 调整前端配置管理中参数分类显示
Merge pull request !278 from huzhibo/N/A
2022-11-10 13:12:18 +00:00
芋道源码
da46818277
!293 fix: 点击菜单编辑按钮错误
Merge pull request !293 from luoqiz/master
2022-11-10 13:07:18 +00:00
luoqiz
5b2caf095c
fix: 点击菜单编辑按钮错误
Signed-off-by: luoqiz <851092732@qq.com>
2022-11-10 12:12:13 +00:00
xingyu4j
414c191472 perf: post 2022-11-10 17:40:42 +08:00
xingyu4j
d2a4eb9254 perf: dict 2022-11-10 14:38:16 +08:00
xingyu4j
d22620a7ce fix: axios error 2022-11-10 14:36:45 +08:00
xingyu4j
8118de4891 fix: axios error 2022-11-10 14:36:32 +08:00
xingyu4j
7922e90135 fix: vxe size 2022-11-10 13:15:55 +08:00
xingyu4j
55405afe94 Merge remote-tracking branch 'origin/dev' into dev 2022-11-10 13:01:29 +08:00
芋道源码
095c0c1941
!292 refactor: Date ==> LocalDateTime && fix vue2 bugs
Merge pull request !292 from xingyu/dev
2022-11-10 04:58:06 +00:00
YunaiV
d3b6a0ca69 1. 修复 refund/index.vue 的报错
2. 优化 DateUtils 的工具类的方法命名
2022-11-10 12:55:26 +08:00
xingyu4j
33e887c07d chore: update devs 2022-11-10 10:09:12 +08:00
xingyu4j
423256c0db fix 滑块验证码error 2022-11-10 09:47:10 +08:00
xingyu4j
edb88a398e Merge remote-tracking branch 'origin/dev' into dev 2022-11-10 09:27:21 +08:00
YunaiV
5934d6b029 trade:完成下单时,创建支付单逻辑 2022-11-10 09:27:20 +08:00
xingyu4j
18e11a56b5 回退sass版本 2022-11-10 09:27:00 +08:00
YunaiV
84f6ec10bc trade:增加优惠劵使用、商品库存的扣减 2022-11-10 00:32:35 +08:00
YunaiV
16f5d0f5a4 trade:增加优惠劵使用、商品库存的扣减 2022-11-09 23:56:00 +08:00
xingyu
7961c8fa95 fix: button 2022-11-09 19:41:22 +08:00
xingyu4j
c701cc92c3 perf: add xtextbutton 2022-11-09 16:32:01 +08:00
xingyu4j
83592ad069 chore: update devs 2022-11-09 16:31:48 +08:00
xingyu4j
b8665a9bc6 perf: add xtextbutton 2022-11-09 16:31:37 +08:00
YunaiV
734236df97 trade:创建订单接口的后端实现的单元测试 100% 2022-11-09 13:03:57 +08:00
xingyu4j
9c033d0104 DateUtils ==> LocalDateTime 2022-11-09 12:43:54 +08:00
xingyu4j
cb006ddf2b DateUtils.buildLocalDateTime ==> LocalDateTime.of 2022-11-09 12:38:01 +08:00
xingyu4j
375229111e docs: update devs 2022-11-09 11:39:45 +08:00
xingyu4j
9358816ad4 Merge remote-tracking branch 'origin/master' into dev 2022-11-09 11:15:41 +08:00
xingyu4j
632a132a6a refactor: Date ==> LocalDateTime 2022-11-09 11:14:46 +08:00
YunaiV
bc2aa78f70 trade:创建订单接口的后端实现的单元测试 50% 2022-11-09 01:03:26 +08:00
芋道源码
bef3511c6e
!291 升级 vue2 && 完善 vue3 vxe demo
Merge pull request !291 from xingyu/dev
2022-11-08 14:51:33 +00:00
YunaiV
01d10b518c trade:优化创建订单接口的后端实现 2022-11-08 22:50:03 +08:00
YunaiV
d7a1c8f7ca promotion:增加获得优惠劵匹配结果的列表的单元测试 2022-11-08 19:32:49 +08:00
xingyu4j
2c1419fb1a vue3 代码生成 2022-11-08 13:59:16 +08:00
xingyu4j
6f1f8d8eaa Merge remote-tracking branch 'origin/master' into dev 2022-11-08 13:45:50 +08:00
xingyu4j
0f40947721 升级部分依赖 2022-11-08 13:43:39 +08:00
xingyu4j
011dc23699 替换var 为const/let
删除未使用import
替换 == 为 ===
2022-11-08 13:31:08 +08:00
xingyu4j
c9e11e7636 fix slot-scope 2022-11-08 12:54:57 +08:00
xingyu4j
d730c50dee 修复代码警告 2022-11-08 12:26:06 +08:00
xingyu4j
fd30368628 update vue 2.7.0 2022-11-08 12:23:15 +08:00
xingyu4j
3fa8e69af0 update element-ui 2.15.10 2022-11-08 11:13:48 +08:00
xingyu4j
3a7f309866 fix: error 2022-11-08 10:33:14 +08:00
xingyu4j
84cb1bd4db chore: update 184 2022-11-08 09:42:22 +08:00
YunaiV
edc5d0f1d0 promotion:增加获得优惠劵匹配结果的列表 2022-11-08 00:40:53 +08:00
LAPTOP-CNV4CMCJ\cheng
fb45f22533 Merge branch 'feature/1.8.0-uniapp' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp 2022-11-08 00:16:15 +08:00