Commit Graph

  • 413656c043 修复 SocialUserServiceTest 单测报错 YunaiV 2022-11-11 00:35:19 +08:00
  • 59f0e75cba Merge remote-tracking branch 'origin/dev' into dev YunaiV 2022-11-11 00:28:47 +08:00
  • 83295a10aa 1. 修复 SmsSendServiceTest 单测的报错 YunaiV 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
  • 5b2caf095c fix: 点击菜单编辑按钮错误 luoqiz 2022-11-10 12:12:13 +00:00
  • 414c191472 perf: post xingyu4j 2022-11-10 17:40:42 +08:00
  • d2a4eb9254 perf: dict xingyu4j 2022-11-10 14:38:16 +08:00
  • d22620a7ce fix: axios error xingyu4j 2022-11-10 14:36:45 +08:00
  • 8118de4891 fix: axios error xingyu4j 2022-11-10 14:36:32 +08:00
  • 7922e90135 fix: vxe size xingyu4j 2022-11-10 13:15:55 +08:00
  • 55405afe94 Merge remote-tracking branch 'origin/dev' into dev xingyu4j 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
  • d3b6a0ca69 1. 修复 refund/index.vue 的报错 2. 优化 DateUtils 的工具类的方法命名 YunaiV 2022-11-10 12:55:26 +08:00
  • 33e887c07d chore: update devs xingyu4j 2022-11-10 10:09:12 +08:00
  • 423256c0db fix 滑块验证码error xingyu4j 2022-11-10 09:47:10 +08:00
  • edb88a398e Merge remote-tracking branch 'origin/dev' into dev xingyu4j 2022-11-10 09:27:21 +08:00
  • 5934d6b029 trade:完成下单时,创建支付单逻辑 YunaiV 2022-11-10 09:27:20 +08:00
  • 18e11a56b5 回退sass版本 xingyu4j 2022-11-10 09:27:00 +08:00
  • 84f6ec10bc trade:增加优惠劵使用、商品库存的扣减 YunaiV 2022-11-10 00:32:35 +08:00
  • 16f5d0f5a4 trade:增加优惠劵使用、商品库存的扣减 YunaiV 2022-11-09 23:56:00 +08:00
  • 7961c8fa95 fix: button xingyu 2022-11-09 19:41:22 +08:00
  • c701cc92c3 perf: add xtextbutton xingyu4j 2022-11-09 16:32:01 +08:00
  • 83592ad069 chore: update devs xingyu4j 2022-11-09 16:31:48 +08:00
  • b8665a9bc6 perf: add xtextbutton xingyu4j 2022-11-09 16:31:37 +08:00
  • 734236df97 trade:创建订单接口的后端实现的单元测试 100% YunaiV 2022-11-09 13:03:57 +08:00
  • 9c033d0104 DateUtils ==> LocalDateTime xingyu4j 2022-11-09 12:43:54 +08:00
  • cb006ddf2b DateUtils.buildLocalDateTime ==> LocalDateTime.of xingyu4j 2022-11-09 12:38:01 +08:00
  • 375229111e docs: update devs xingyu4j 2022-11-09 11:39:45 +08:00
  • 9358816ad4 Merge remote-tracking branch 'origin/master' into dev xingyu4j 2022-11-09 11:15:41 +08:00
  • 632a132a6a refactor: Date ==> LocalDateTime xingyu4j 2022-11-09 11:14:46 +08:00
  • bc2aa78f70 trade:创建订单接口的后端实现的单元测试 50% YunaiV 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
  • 01d10b518c trade:优化创建订单接口的后端实现 YunaiV 2022-11-08 22:50:03 +08:00
  • d7a1c8f7ca promotion:增加获得优惠劵匹配结果的列表的单元测试 YunaiV 2022-11-08 19:32:49 +08:00
  • 2c1419fb1a vue3 代码生成 xingyu4j 2022-11-08 13:59:16 +08:00
  • 6f1f8d8eaa Merge remote-tracking branch 'origin/master' into dev xingyu4j 2022-11-08 13:45:50 +08:00
  • 0f40947721 升级部分依赖 xingyu4j 2022-11-08 13:43:39 +08:00
  • 011dc23699 替换var 为const/let 删除未使用import 替换 == 为 === xingyu4j 2022-11-08 13:31:08 +08:00
  • c9e11e7636 fix slot-scope xingyu4j 2022-11-08 12:54:57 +08:00
  • d730c50dee 修复代码警告 xingyu4j 2022-11-08 12:26:06 +08:00
  • fd30368628 update vue 2.7.0 xingyu4j 2022-11-08 12:23:15 +08:00
  • 3fa8e69af0 update element-ui 2.15.10 xingyu4j 2022-11-08 11:13:48 +08:00
  • 3a7f309866 fix: error xingyu4j 2022-11-08 10:33:14 +08:00
  • 84cb1bd4db chore: update 184 xingyu4j 2022-11-08 09:42:22 +08:00
  • edc5d0f1d0 promotion:增加获得优惠劵匹配结果的列表 YunaiV 2022-11-08 00:40:53 +08:00
  • fb45f22533 Merge branch 'feature/1.8.0-uniapp' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp LAPTOP-CNV4CMCJ\cheng 2022-11-08 00:16:15 +08:00
  • ea5e6b2c0e 新增了订单详情 LAPTOP-CNV4CMCJ\cheng 2022-11-08 00:16:08 +08:00
  • dc84ebde9d perf: vxe demo xingyu4j 2022-11-07 18:13:04 +08:00
  • 1a45526a9d fix: page loading xingyu4j 2022-11-07 15:10:48 +08:00
  • efb4cf0c66 fix: print Params xingyu4j 2022-11-07 14:58:53 +08:00
  • 4bc7645850 feat: vxe 全局滚动条样式 xingyu4j 2022-11-07 14:39:15 +08:00
  • b1d0fe7599 style: post button xingyu4j 2022-11-07 14:12:16 +08:00
  • 111488e5d6 refactor: codegen xingyu4j 2022-11-07 14:02:48 +08:00
  • cb6a9a1282 !288 修复vue3 部分bug 重构axios 完善vxe demo Merge pull request !288 from xingyu/dev 芋道源码 2022-11-07 05:35:51 +00:00
  • 4b7e7d61f7 fix: bugs xingyu4j 2022-11-07 13:25:23 +08:00
  • 77067a11bb chore: update deps xingyu4j 2022-11-07 09:39:44 +08:00
  • 05614cc0b8 trade:完善 TradeOrderItemDO 字段 YunaiV 2022-11-06 23:55:59 +08:00
  • d10f49b6a7 promotion:优化价格计算的接口,增加 orderPrice 字段 YunaiV 2022-11-06 22:25:02 +08:00
  • 636cc794dd promotion:完善价格计算,重新接入限时折扣的多种优惠方式 YunaiV 2022-11-06 18:41:27 +08:00
  • c87bc084e6 promotion:RewardActivityServiceImpl 的 getMatchRewardActivities 逻辑 YunaiV 2022-11-06 16:36:14 +08:00
  • 941782fb10 promotion:完善限时折扣的修改逻辑 YunaiV 2022-11-06 12:38:13 +08:00
  • 6d48bd1ed8 promotion:完善限时折扣的添加逻辑 YunaiV 2022-11-06 00:48:07 +08:00
  • 544597d6e2 promotion:完善限时折扣,补充相关的单元测试 YunaiV 2022-11-05 19:57:50 +08:00
  • d4b7f4aaa0 promotion:增加限时折扣的基础代码 YunaiV 2022-11-05 19:13:43 +08:00
  • 00f90e75d9 promotion:增加满减送活动的关闭功能 YunaiV 2022-11-05 10:52:09 +08:00
  • 79304b3a73 promotion:增加满减送活动的排重校验、单元测试 YunaiV 2022-11-05 09:57:45 +08:00
  • 74b6ff1eef promotion:增加满减送活动的前端 50% YunaiV 2022-11-05 00:14:02 +08:00
  • 0e5b7734ac promotion:增加满减送活动的后端 20% YunaiV 2022-11-04 23:19:28 +08:00
  • 873b530652 promotion:增加优惠劵的回收操作 YunaiV 2022-11-04 21:17:37 +08:00
  • 47c2dfa623 promotion:增加优惠劵的前端分页界面 100% YunaiV 2022-11-04 19:17:17 +08:00
  • 6c499faafd fix: button error xingyu4j 2022-11-04 18:19:11 +08:00
  • bca13b1961 feat: xbutton xingyu4j 2022-11-04 18:01:46 +08:00
  • d79b23c8a2 feat: add modal component xingyu4j 2022-11-04 16:43:11 +08:00
  • 1c1cafdc7f feat: vxe tree table xingyu4j 2022-11-04 10:54:52 +08:00
  • 86b6b85934 promotion:增加优惠劵的前端分页界面 80% YunaiV 2022-11-04 00:27:37 +08:00
  • a89d5a83db promotion:增加优惠劵的后端分页接口 YunaiV 2022-11-03 22:40:19 +08:00
  • eb5870f35e feat: menu vxe table xingyu4j 2022-11-03 18:09:55 +08:00
  • fc8a233552 feat: menu vxe table xingyu4j 2022-11-03 18:09:40 +08:00
  • b5a4a5446e fix: vue3 代码生成错误 xingyu4j 2022-11-03 17:01:37 +08:00
  • 3eb11e2658 refactor: refactor axios xingyu4j 2022-11-03 16:55:01 +08:00
  • 9adc84c396 Merge remote-tracking branch 'origin/master' into dev xingyu4j 2022-11-03 14:34:55 +08:00
  • 49237ad966 feat: add vxe crud schemas xingyu4j 2022-11-03 14:33:30 +08:00
  • ee3ac7b663 !282 修复 vue3 部分问题,引入 vxe-table Merge pull request !282 from xingyu/dev 芋道源码 2022-11-03 04:32:34 +00:00
  • e1b4ab2d1b fix: jsencrypt error xingyu4j 2022-11-03 10:47:21 +08:00
  • 87c40a4ab1 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro shizhong 2022-11-03 09:44:48 +08:00
  • 2c39405bce promotion:完善的优惠卷的实体 YunaiV 2022-11-03 00:05:13 +08:00
  • 8ae8a4a652 promotion:完善优惠劵模板的单元测试、禁用功能 YunaiV 2022-11-02 22:44:37 +08:00
  • e3a700b2d2 Merge remote-tracking branch 'origin/feature/1.8.0-uniapp' into feature/1.8.0-uniapp YunaiV 2022-11-02 22:19:40 +08:00
  • bd661296c0 promotion:完善优惠劵模板的功能 YunaiV 2022-11-02 22:19:33 +08:00
  • 3537672a52 fix: captcha enable xingyu4j 2022-11-02 13:50:41 +08:00
  • ad42eca847 feat: vxe demo xingyu4j 2022-11-02 11:12:47 +08:00
  • a33120c5d5 Merge remote-tracking branch 'origin/master' into dev xingyu4j 2022-11-02 11:11:09 +08:00
  • 63cb9eb47e Merge branch 'feature/1.8.0-uniapp' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp LAPTOP-CNV4CMCJ\cheng 2022-11-02 10:46:58 +08:00
  • 89fefc5f81 处理了商品订单的TODO LAPTOP-CNV4CMCJ\cheng 2022-11-02 10:46:42 +08:00
  • ce33b5c219 !283 fix:vue3 bug Merge pull request !283 from weikun/master 芋道源码 2022-11-02 02:01:54 +00:00