2948 Commits (6291a3d7d8f587cf67dcbc53d3278376fbeb2e19)
 

Author SHA1 Message Date
xingyu4j ad42eca847 feat: vxe demo 3 years ago
xingyu4j a33120c5d5 Merge remote-tracking branch 'origin/master' into dev
# Conflicts:
#	yudao-ui-admin-vue3/package.json
3 years ago
LAPTOP-CNV4CMCJ\cheng 63cb9eb47e Merge branch 'feature/1.8.0-uniapp' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp 3 years ago
LAPTOP-CNV4CMCJ\cheng 89fefc5f81 处理了商品订单的TODO 3 years ago
芋道源码 ce33b5c219
!283 fix:vue3 bug
Merge pull request !283 from weikun/master
3 years ago
YunaiV 2aaeb7af88 promotion:实现部分优惠劵模板的前端表单 80% 3 years ago
YunaiV dc51a93533 promotion:实现部分优惠劵模板的前端列表 3 years ago
xingyu4j 3cd6bb3148 fix: seach 3 years ago
xingyu4j 8917dcf6bf perf: vxe demo 3 years ago
xingyu4j a95694ae6b perf: vxe demo 3 years ago
huyuehua 38161f05ac fix:(同步失败,不存在改变)代码生成,修改字段注解都不能修改
https://gitee.com/zhijiantianya/ruoyi-vue-pro/issues/I5WP5M
3 years ago
xingyu4j 220e0316e0 feat: vxe demo 3 years ago
weikun 5596984e32 fix: 修改密码api 3 years ago
xingyu4j 2e2cd448bd chore: update devs 3 years ago
xingyu4j 6a542b6104 perf: 优化描述组件 3 years ago
xingyu4j 983a636928 Merge remote-tracking branch 'origin/master' into dev 3 years ago
芋道源码 9745682598
!286 修复代码生成选择父菜单无效,修复生成的前端代码缺少字段以及格式错误
Merge pull request !286 from 绝影jy/fixed
3 years ago
YunaiV 3c10058dbd promotion:实现部分优惠劵模板的前端逻辑 3 years ago
YunaiV 979ba0f916 promotion:实现优惠劵模板的逻辑 3 years ago
YunaiV 035c2cf28c promotion:完善 优惠劵模板 表~ 3 years ago
jueying faea04546e 修复代码生成父菜单选择无效,前端代码缺少字段,格式错误 3 years ago
YunaiV cca27636b7 code review 订单列表.vue 界面 3 years ago
YunaiV e6acdf7098 将 market 模块,调整成 promotion 模块 3 years ago
YunaiV 829bbf58b5 price:完成优惠劵的价格计算~ 3 years ago
YunaiV 160d619d59 price:完成满减送的价格计算~ 3 years ago
YunaiV 4e9fe4bc54 price:完成限时折扣的价格计算~ 3 years ago
YunaiV 084d4baba2 price:完成会员价格的计算~ 3 years ago
YunaiV a88eda340b 调整 price 接口,参考 taobao 的技术文档 3 years ago
YunaiV 3b506006dd Merge remote-tracking branch 'origin/feature/1.8.0-uniapp' into feature/1.8.0-uniapp 3 years ago
YunaiV 5c4b61f5ff 暂存调整 Price 接口 3 years ago
SuperHao 26c728b050
bugfix: 当修改保存模型,再发布时,提示"流程定义部署失败,原因:信息未发生变化" 3 years ago
weikun 04fb4c0365 fix: 路由顶级非目录菜单直接显示 3 years ago
魏坤 74dfc60ef0 fix :token刷新、rememberMe 、暗黑模式保存 、验证码开关 bug
add: 字体抗锯齿
3 years ago
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 3 years ago
LAPTOP-CNV4CMCJ\cheng dcb3f1c8f0 新增订单管理页面 3 years ago
luowenfeng d91655f3c4 feature(商城): 修改单元测试 3 years ago
luowenfeng 7dd12a3e81 Merge branch 'feature/1.8.0-uniapp' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp 3 years ago
YunaiV e1d5cfe8fe 微调 trade 交易表的设计 3 years ago
luowenfeng 20c79b7053 Merge branch 'feature/1.8.0-uniapp' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp 3 years ago
xingyu 3b3404747e chore: update deps 3 years ago
xingyu 97cab05df2 feat: 升级依赖 3 years ago
xingyu 70fab167be feat: 升级依赖 3 years ago
xingyu d87dc01dc8 Merge remote-tracking branch 'origin/master' into dev 3 years ago
YunaiV 356642ecea review 商品的 save 界面 3 years ago
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
3 years ago
YunaiV 7bf37fcb64 优化管理后台的商品分页的查询 3 years ago
YunaiV c00ded3ed3 优化商品的 index 界面 3 years ago
chenlei65368 bb8204b5a7
fix WXLitePayClient.java 中copy应忽略的字段
小程序支付,copy应忽略 "privateKeyContent","privateCertContent",而不是“KeyContent”

Signed-off-by: chenlei65368 <chenlei65368@sohu.com>
3 years ago
luowenfeng dc4e3fcd6e feature(商城): 商城review改 3 years ago
luowenfeng 8c4e3db32b feature(商城): 商城review改 3 years ago