huangge1199/vue-pro
1
0
Fork 0
mirror of https://gitee.com/huangge1199_admin/vue-pro.git synced 2024-11-24 08:11:55 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
5,149 Commits 1 Branch 0 Tags 176 MiB
a1e9bedf34
Commit Graph

5149 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
puhui999
8dfb298376 fix：完善 mall seckill 相关 ① 2023-06-20 09:08:15 +08:00
puhui999
9517ffdfb8 fix：修复 mall product promotion 测试 sql 2023-06-20 09:06:32 +08:00
YunaiV
bf7f68a04b mall + promotion：增加拼团的 mock 返回 2023-06-19 23:35:28 +08:00
YunaiV
8a7f7fd641 mall + promotion：增加拼团的 mock 返回 2023-06-19 20:35:43 +08:00
chenchen
2f0aaee823 售后日志优化 2023-06-19 17:04:07 +08:00
xiaobai
d6bd4be8b0 '' 2023-06-19 13:10:50 +08:00
xiaobai
32b348a2d3 Merge branch 'feature/mall_product' of https://gitee.com/joly_xiaobai/ruoyi-vue-pro into mall_product 
# Conflicts:
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/vo/TradeOrderBaseVO.java
 2023-06-19 13:06:00 +08:00
xiaobai
6b3af71735 订单详情修改20230619 2023-06-19 12:50:28 +08:00
chenchen
b7c0fef63f Merge branch 'feature/mall_product' into mall_product_aftersalelog 
# Conflicts:
#	yudao-framework/yudao-spring-boot-starter-biz-trade/pom.xml
#	yudao-module-mall/yudao-module-trade-biz/pom.xml
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/aftersale/TradeAfterSaleServiceImpl.java
#	yudao-server/pom.xml
 2023-06-19 10:22:05 +08:00
chenchen
2672b3e2fa fix 依赖启动问题 2023-06-19 10:19:47 +08:00
chenchen
a93b9a616f 售后日志优化 2023-06-19 10:19:29 +08:00
xingyu
7fc1016e90 chore: up captcha-plus 1.0.4 2023-06-19 09:47:18 +08:00
xingyu
850d028ec7 chore: 添加华为云maven aliyun同步速度慢 2023-06-19 09:47:01 +08:00
puhui999
331be53b8b fix：完善时段配置管理 2023-06-19 08:58:11 +08:00
puhui999
49d726019a Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 2023-06-19 08:33:48 +08:00
YunaiV
fc570b6062 mall + promotion：完善秒杀活动的 mock 返回 2023-06-18 21:23:50 +08:00
YunaiV
d795dbc7ac mall + promotion：优化限购、库存的返回结果 2023-06-18 20:15:34 +08:00
puhui999
cd4940d710 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 2023-06-18 13:17:36 +08:00
YunaiV
a93acd2a74 mall + promotion：mock 秒杀列表 2023-06-18 02:05:10 +08:00
YunaiV
6573849f56 mall + promotion：mock 拼团列表 2023-06-18 00:35:22 +08:00
chenchen
7d0e9ea762 fix 依赖启动问题 2023-06-17 23:47:38 +08:00
YunaiV
60b24e36d5 code review：售后日志逻辑 2023-06-17 22:15:03 +08:00
puhui999
1871a01944 fix：seckill：调整相关类属性和表字段对齐 2023-06-17 22:14:23 +08:00
陈賝
59e16795be !514 mall交易日志封装 
* 交易日志封装
* 交易日志封装
* 交易日志模块
 2023-06-17 14:00:10 +00:00
YunaiV
35df912be7 code review：商品评价哈 2023-06-17 21:57:52 +08:00
芋道源码
08535d6019
!509 完善商品评论 
Merge pull request !509 from puhui999/feature/mall_product
 2023-06-17 13:39:35 +00:00
puhui999
16f2a5b91a Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 2023-06-17 21:19:02 +08:00
puhui999
32cca12cd2 fix：seckillTime => seckillConfig 2023-06-17 21:17:02 +08:00
YunaiV
fd072b7d6e code review：会员积分配置 2023-06-17 18:33:17 +08:00
芋道源码
798e322f08
!506 积分模块 
Merge pull request !506 from QingX/feature/mall_product
 2023-06-17 09:41:41 +00:00
xiaqing
8e3a65d84c 本地连接修改 2023-06-17 16:39:28 +08:00
YunaiV
8d58b1e862 Bump guava from 31.1-jre to 32.0.0-jre in /yudao-dependencies #96 2023-06-17 14:19:26 +08:00
YunaiV
a4c11b890c fix(sec): upgrade commons-net:commons-net to #98 2023-06-17 14:17:24 +08:00
YunaiV
079fa42ba3 Merge branch 'master' of https://github.com/YunaiV/ruoyi-vue-pro 2023-06-17 14:12:44 +08:00
芋道源码
74aebfca3e
Merge pull request #292 from aboutZZ/fix 
修复PG数据库部分字典数据缺失；修复PG数据库因字段无默认值无法直接运行生成的SQL
 2023-06-17 14:03:27 +08:00
YunaiV
c7e3a8c126 修复 Vue 2生产环境打包压缩等配置未生效问题 2023-06-17 13:58:55 +08:00
YunaiV
1f4f8c0747 Merge branch 'dev-fix-sql4pg' of https://gitee.com/congqinggit/ruoyi-vue-pro 
 Conflicts:
	sql/postgresql/ruoyi-vue-pro.sql
 2023-06-17 12:45:31 +08:00
YunaiV
ecfe0b864b 优化 RedisPendingMessageResendJob 代码排版，以及注释 2023-06-17 12:41:56 +08:00
芋道源码
a978c99617
!480 解决RedisPendingMessageResendJob 任务可能会导致消息重复的问题 
Merge pull request !480 from 天气真好/redis-stream-mq
 2023-06-17 04:36:51 +00:00
YunaiV
16dd86a8db 498 解决解决 Set access token expire time to 0 报错问题和邮件发送用户编号为空问题 2023-06-17 12:36:13 +08:00
芋道源码
933bb188bd
!498 解决解决 Set access token expire time to 0 报错问题和邮件发送用户编号为空问题 
Merge pull request !498 from clockdotnet/master_pr
 2023-06-17 04:33:16 +00:00
芋道源码
281590c48e
!505 修复使用PG数据库时,站内信表、菜单权限表字段类型不一致问题 
Merge pull request !505 from 呵呵大/N/A
 2023-06-17 04:31:22 +00:00
芋道源码
03d7d2eead
!508 使用docker compose -T来执行数据导入 
Merge pull request !508 from dhb52/N/A
 2023-06-17 04:26:51 +00:00
芋道源码
09776a73b5
!511 fix：修改第1点描述错误， 【用户看到 】改为 【用户看不到】 
Merge pull request !511 from Syriana_Zh/N/A
 2023-06-17 04:26:36 +00:00
芋道源码
e791a06e2e
!512 修复-公众号标签修改提示报错 
Merge pull request !512 from 再难也要坚持/master
 2023-06-17 04:22:39 +00:00
YunaiV
749fe9d515 回退验证码到 1.0.2 2023-06-17 12:19:46 +08:00
芋道源码
7e6a3d2e36
!513 优化代码生成 
Merge pull request !513 from xingyu/fix/codegen
 2023-06-17 04:03:02 +00:00
YunaiV
0d47d6cead mall + trade：code review 快递客户端的实现，没啥问题咧，搞下单测就 ok 拉 2023-06-17 11:59:38 +08:00
YunaiV
59d5fef592 mall + trade：优化运费模版的代码 2023-06-17 11:35:31 +08:00
YunaiV
07fe52939d mall + promotion：mock banner mock 接口 2023-06-17 00:47:47 +08:00