shizhong
|
3e936f3959
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
Conflicts:
yudao-ui-admin/yarn.lock
|
2022-09-16 11:05:25 +08:00 |
|
ex_yang.li@ca-nio.com
|
9cf470df94
|
创建交易订单-单元测试-冲突合并
|
2022-09-15 17:28:08 +08:00 |
|
ex_yang.li@ca-nio.com
|
f21ce954ec
|
Merge remote-tracking branch 'origin/feature/1.8.0-uniapp' into ly_uniapp
# Conflicts:
# yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/api/price/PriceApiImpl.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/api/sku/ProductSkuApiImpl.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/api/spu/ProductSpuApiImpl.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/sku/ProductSkuConvert.java
# 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-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderConvert.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderItemConvert.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderServiceImpl.java
# yudao-server/src/main/resources/application.yaml
|
2022-09-15 17:09:17 +08:00 |
|
ex_yang.li@ca-nio.com
|
5889093a64
|
创建交易订单-单元测试
|
2022-09-15 16:57:04 +08:00 |
|
luowenfeng
|
e1e55dc841
|
feature(商品添加): 规格调整连带商品调整
|
2022-09-14 11:57:30 +08:00 |
|
YunaiV
|
15798cea10
|
mall：价格计算的 API 简单实现
|
2022-09-12 21:37:24 +08:00 |
|
芋道源码
|
7643ed5a4b
|
!264 定时任务-调度日志-详细里面”执行时长“显示异常问题
Merge pull request !264 from Vmo/master
|
2022-09-10 13:48:02 +00:00 |
|
芋道源码
|
c8cc3a57f7
|
!265 商品模块 60%
Merge pull request !265 from 芋道源码/feature/1.8.0-uniapp
|
2022-09-10 13:45:28 +00:00 |
|
YunaiV
|
67d365475c
|
🐛修复创建订单的流程，使用到 API Bean 未声明的报错
|
2022-09-10 21:41:21 +08:00 |
|
YunaiV
|
38e88b02f5
|
🐛修复数据权限，不支持隐式内连接的问题
|
2022-09-10 21:37:16 +08:00 |
|
airhead
|
02c45e405f
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# yudao-dependencies/pom.xml
|
2022-09-09 23:08:08 +08:00 |
|
airhead
|
72883aa975
|
fix(dependencies): 修改合并错误
|
2022-09-09 23:06:58 +08:00 |
|
airhead
|
6b429584bf
|
fix(tenant): 租户缓存增加注释
|
2022-09-09 22:56:26 +08:00 |
|
airhead
|
0e1babd7f4
|
feat(redis): 注解支持多租户缓存
1.增加多租户Cache
2.修复Mac M1启动报错
|
2022-09-09 22:56:25 +08:00 |
|
idevmo
|
378067fce7
|
定时任务-调度日志-详细里面”执行时长“显示异常的问题
|
2022-09-09 10:16:44 +08:00 |
|
芋道源码
|
61b0624a59
|
!262 接口实现-交易订单创建(未完全实现)
Merge pull request !262 from LeeYan9/ly_uniapp
|
2022-09-05 13:16:11 +00:00 |
|
YunaiV
|
c06077e3a6
|
mall：code review 商品的代码
|
2022-09-05 21:02:44 +08:00 |
|
ex_yang.li@ca-nio.com
|
7bf20ec72e
|
创建订单接口定义
|
2022-09-05 20:44:04 +08:00 |
|
YunaiV
|
2cc60deb97
|
mall：code review 商品规格、规格值的代码
|
2022-09-05 20:29:27 +08:00 |
|
YunaiV
|
9632c33d27
|
mall：优化商品的分类、品牌的代码
|
2022-09-05 20:03:13 +08:00 |
|
YunaiV
|
1bd1c79ff3
|
mall：code review 商品模块的代码
|
2022-09-05 00:14:17 +08:00 |
|
YunaiV
|
37e948cc1b
|
Merge remote-tracking branch 'origin/feature/1.8.0-uniapp' into feature/1.8.0-uniapp
|
2022-09-04 23:15:36 +08:00 |
|
YunaiV
|
f4324a22f2
|
mall： code review 商品模块的代码
|
2022-09-04 23:15:29 +08:00 |
|
wuxiran
|
02aede0417
|
1、修改coupon的页面、以及增加coupon的enum
|
2022-09-04 22:52:28 +08:00 |
|
YunaiV
|
833fd33844
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp
Conflicts:
sql/optional/mall/mall.sql
|
2022-09-04 21:06:28 +08:00 |
|
芋道源码
|
dd6dc2ac3d
|
!246 集成aj-captcha
Merge pull request !246 from xingyu/master
|
2022-09-04 09:45:54 +00:00 |
|
YunaiV
|
9715087b54
|
管理后台的 uniapp 验证码，增加开关
|
2022-09-04 17:44:26 +08:00 |
|
YunaiV
|
a484cd5193
|
优化图片验证码的后端实现
|
2022-09-04 12:44:02 +08:00 |
|
YunaiV
|
b134492fa9
|
vue3 验证码，增加开关
|
2022-09-04 12:35:23 +08:00 |
|
YunaiV
|
1a48301cee
|
vue2 验证码，增加开关、修复对社交登录的支持
|
2022-09-04 12:18:12 +08:00 |
|
YunaiV
|
926c75d29a
|
优化图片验证码的后端实现
|
2022-09-04 11:26:37 +08:00 |
|
芋道源码
|
d918b14e90
|
!260 增加servicetask的完成和todo高亮，增加servicetask节点的hover显示内容
Merge pull request !260 from FinalFinancialFreedom/N/A
|
2022-09-03 02:25:58 +00:00 |
|
芋道源码
|
9bf1e10668
|
!258 修复导入用户后编辑报错；修复不退出模拟直接保存模型，后续分配规则报错
Merge pull request !258 from wangjun/master
|
2022-09-03 02:23:47 +00:00 |
|
芋道源码
|
4fd655e247
|
!259 修复WxMaService 的null key in entry报错
Merge pull request !259 from rayyer/upstream
|
2022-09-03 02:19:34 +00:00 |
|
luowenfeng
|
ab6fd30551
|
feature(uniapp商品): 商品功能完善
|
2022-09-01 15:28:05 +08:00 |
|
luowenfeng
|
198b1189e8
|
feature(uniapp商品): 商品修改
|
2022-09-01 11:00:40 +08:00 |
|
shizhong
|
44e2a710fc
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2022-09-01 09:49:09 +08:00 |
|
YunaiV
|
96db6b97ad
|
mall：解决 ProductSkuDO.properties 属性
|
2022-08-31 23:26:17 +08:00 |
|
luowenfeng
|
4207b2b61d
|
feature(uniapp商品): 商品加载
|
2022-08-31 18:52:26 +08:00 |
|
FinalFinancialFreedom
|
4c8b0ef430
|
增加servicetask的完成和todo高亮，增加servicetask节点的hover显示内容
Signed-off-by: FinalFinancialFreedom <li.acerphoenix@gmail.com>
|
2022-08-29 08:43:12 +00:00 |
|
GuoLei
|
c4f416c7cd
|
修复dev环境WxMaService 报错
|
2022-08-27 10:02:27 +08:00 |
|
ex_yang.li@ca-nio.com
|
19a703b8c9
|
创建订单接口定义
|
2022-08-26 17:47:43 +08:00 |
|
wangjun
|
e25b73b7d9
|
修复不退出模拟直接保存模型，后续分配规则报错
|
2022-08-26 09:33:53 +08:00 |
|
wangjun
|
d706cc3fb3
|
修复导入用户后编辑报错
|
2022-08-26 09:32:03 +08:00 |
|
luowenfeng
|
4a39f2d9f8
|
feature(uniapp商品): 代码调整
|
2022-08-25 17:10:26 +08:00 |
|
airhead
|
8527bd3c77
|
fix(tenant): 租户缓存增加注释
|
2022-08-25 15:53:01 +08:00 |
|
luowenfeng
|
0bc2ef1d39
|
feature(uniapp商品): 商品业务代码调整
|
2022-08-24 14:08:32 +08:00 |
|
YunaiV
|
c2fd24f597
|
mall：code review 商品 spu 的后端代码
|
2022-08-23 23:58:22 +08:00 |
|
luowenfeng
|
edfe379848
|
feature(uniapp商品): 多规格新增
|
2022-08-23 21:06:59 +08:00 |
|
luowenfeng
|
8ad1439fda
|
feature(uniapp商品): 新增商品
|
2022-08-23 20:27:39 +08:00 |
|