huangge1199/vue-pro
1
0
Fork 0
mirror of https://gitee.com/huangge1199_admin/vue-pro.git synced 2024-11-23 15:51:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
3,189 Commits 1 Branch 0 Tags 176 MiB
0f31ce7ecf
Commit Graph

3189 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
xingyu4j
a95694ae6b perf: vxe demo 2022-11-01 15:56:40 +08:00
huyuehua
38161f05ac fix:（同步失败，不存在改变）代码生成，修改字段注解都不能修改 
https://gitee.com/zhijiantianya/ruoyi-vue-pro/issues/I5WP5M
 2022-11-01 14:50:27 +08:00
xingyu4j
220e0316e0 feat: vxe demo 2022-11-01 14:36:18 +08:00
weikun
5596984e32 fix: 修改密码api 2022-11-01 14:07:42 +08:00
xingyu4j
2e2cd448bd chore: update devs 2022-11-01 10:04:15 +08:00
xingyu4j
6a542b6104 perf: 优化描述组件 2022-11-01 09:46:13 +08:00
xingyu4j
983a636928 Merge remote-tracking branch 'origin/master' into dev 2022-11-01 09:25:02 +08:00
芋道源码
9745682598
!286 修复代码生成选择父菜单无效，修复生成的前端代码缺少字段以及格式错误 
Merge pull request !286 from 绝影jy/fixed
 2022-11-01 01:19:24 +00:00
YunaiV
3c10058dbd promotion：实现部分优惠劵模板的前端逻辑 2022-11-01 00:37:07 +08:00
YunaiV
979ba0f916 promotion：实现优惠劵模板的逻辑 2022-10-31 23:47:06 +08:00
YunaiV
035c2cf28c promotion：完善 优惠劵模板 表~ 2022-10-31 21:19:18 +08:00
jueying
faea04546e 修复代码生成父菜单选择无效，前端代码缺少字段，格式错误 2022-10-31 17:13:05 +08:00
YunaiV
cca27636b7 code review 订单列表.vue 界面 2022-10-31 10:09:10 +08:00
YunaiV
e6acdf7098 将 market 模块，调整成 promotion 模块 2022-10-30 17:37:07 +08:00
YunaiV
829bbf58b5 price：完成优惠劵的价格计算~ 2022-10-30 17:32:59 +08:00
YunaiV
160d619d59 price：完成满减送的价格计算~ 2022-10-30 13:20:07 +08:00
YunaiV
4e9fe4bc54 price：完成限时折扣的价格计算~ 2022-10-29 22:23:48 +08:00
YunaiV
084d4baba2 price：完成会员价格的计算~ 2022-10-29 21:46:19 +08:00
YunaiV
a88eda340b 调整 price 接口，参考 taobao 的技术文档 2022-10-28 23:49:15 +08:00
YunaiV
3b506006dd Merge remote-tracking branch 'origin/feature/1.8.0-uniapp' into feature/1.8.0-uniapp 2022-10-28 22:44:18 +08:00
YunaiV
5c4b61f5ff 暂存调整 Price 接口 2022-10-28 22:44:12 +08:00
SuperHao
26c728b050
bugfix: 当修改保存模型，再发布时，提示"流程定义部署失败，原因：信息未发生变化" 2022-10-28 09:04:41 +00:00
weikun
04fb4c0365 fix: 路由顶级非目录菜单直接显示 2022-10-28 10:55:51 +08:00
魏坤
74dfc60ef0 fix :token刷新、rememberMe 、暗黑模式保存 、验证码开关 bug 
add: 字体抗锯齿
 2022-10-28 09:28:20 +08:00
LAPTOP-CNV4CMCJ\cheng
e035e66ffd Merge branch 'feature/1.8.0-uniapp' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp 2022-10-27 16:49:53 +08:00
LAPTOP-CNV4CMCJ\cheng
dcb3f1c8f0 新增订单管理页面 2022-10-27 16:49:47 +08:00
luowenfeng
d91655f3c4 feature(商城): 修改单元测试 2022-10-27 11:00:14 +08:00
luowenfeng
7dd12a3e81 Merge branch 'feature/1.8.0-uniapp' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp 2022-10-27 10:30:27 +08:00
YunaiV
e1d5cfe8fe 微调 trade 交易表的设计 2022-10-26 21:25:29 +08:00
luowenfeng
20c79b7053 Merge branch 'feature/1.8.0-uniapp' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp 2022-10-26 14:57:45 +08:00
xingyu
3b3404747e chore: update deps 2022-10-26 09:44:07 +08:00
xingyu
97cab05df2 feat: 升级依赖 2022-10-26 09:16:26 +08:00
xingyu
70fab167be feat: 升级依赖 2022-10-26 09:02:51 +08:00
xingyu
d87dc01dc8 Merge remote-tracking branch 'origin/master' into dev 2022-10-26 09:00:08 +08:00
YunaiV
356642ecea review 商品的 save 界面 2022-10-25 22:13:31 +08:00
luowenfeng
d92d257619 Merge branch 'feature/1.8.0-uniapp' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp 
 Conflicts:
	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/sku/ProductSkuMapper.java
	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuServiceImpl.java
 2022-10-25 11:15:17 +08:00
YunaiV
7bf37fcb64 优化管理后台的商品分页的查询 2022-10-24 22:12:47 +08:00
YunaiV
c00ded3ed3 优化商品的 index 界面 2022-10-24 21:27:13 +08:00
chenlei65368
bb8204b5a7
fix WXLitePayClient.java 中copy应忽略的字段 
小程序支付，copy应忽略 "privateKeyContent","privateCertContent"，而不是“KeyContent”

Signed-off-by: chenlei65368 <chenlei65368@sohu.com>
 2022-10-24 10:43:04 +00:00
luowenfeng
dc4e3fcd6e feature(商城): 商城review改 2022-10-24 10:30:47 +08:00
luowenfeng
8c4e3db32b feature(商城): 商城review改 2022-10-24 10:28:07 +08:00
YunaiV
2bd2cb56a1 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp 
 Conflicts:
	yudao-module-mall/yudao-module-trade-biz/pom.xml
 2022-10-23 22:16:54 +08:00
YunaiV
412c017f21 code review 商品模块 2022-10-23 22:15:26 +08:00
YunaiV
3cee922e69 优化 permission 相关的注释 2022-10-23 20:21:10 +08:00
luowenfeng
69c87f8b24 Merge branch 'feature/1.8.0-uniapp' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp 2022-10-22 17:51:45 +08:00
luowenfeng
aea763e96e feature(单元测试): ProductSpuServiceImpl单元测试 2022-10-22 17:51:26 +08:00
xingyu
566238c2dd feat: 升级依赖 2022-10-20 17:46:07 +08:00
xingyu
2b9d96c1b8 chore: update deps 2022-10-20 12:05:51 +08:00
Macro
fc76a67c73
短信接收报告回调处理小Bug 
receiveSmsStatus() 方法中最后调用 updateSmsReceiveResult() 方法传参错误，第二个 result.getErrorCode()  应改为 result.getErrorMsg()

Signed-off-by: Macro <8676847+hibernate2021@user.noreply.gitee.com>
 2022-10-19 10:28:03 +00:00
xingyu
aa3aa56140 feat: add vxe-table 2022-10-19 18:08:42 +08:00