huangge1199/vue-pro
1
0
Fork 0
mirror of https://gitee.com/huangge1199_admin/vue-pro.git synced 2024-11-27 09:41:58 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
4,616 Commits 1 Branch 0 Tags 176 MiB
e8c1bdde3d
Commit Graph

4616 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
YunaiV
5b324f90a4 mall + promotion：mock 拼团活动列表 2023-06-16 23:27:27 +08:00
YunaiV
8ec3733882 mall + trade：mock 拼团记录列表的接口 2023-06-16 20:32:03 +08:00
YunaiV
af9334c9b2 mall + trade：mock 拼团记录详情的接口 2023-06-16 00:12:49 +08:00
jason
1662d17fc9 快递客户端 review 修改 2023-06-15 14:59:31 +08:00
jason
e69e6d880b 快递价格计算 review 修改 2023-06-15 10:49:24 +08:00
puhui999
217a31a123 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 2023-06-15 09:11:07 +08:00
YunaiV
af0eeb6e3b Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-06-14 23:08:28 +08:00
YunaiV
b74991e242 mall + trade：mock 拼团活动详情的接口 2023-06-14 23:08:22 +08:00
xingyu
b892a6d2bd feat: captcha-plus 1.0.4 2023-06-14 18:00:14 +08:00
xingyu
25df1e2ecd revert: config 2023-06-14 17:58:51 +08:00
sunyuqiang
296256a55a 修复-公众号标签修改提示报错“[微信公众号 yudao-module-mp - 已禁用][参考 https://doc.iocoder.cn/mp/build/ 开启]” 2023-06-14 17:30:15 +08:00
sunyuqiang
66f09ed54b 修复-公众号标签修改提示报错“[微信公众号 yudao-module-mp - 已禁用][参考 https://doc.iocoder.cn/mp/build/ 开启]” 2023-06-14 17:19:50 +08:00
xingyu
cd33f68e2b chore: up springboot 2.10.12 2023-06-14 16:50:46 +08:00
xingyu
4953d5ec62 fix: vben codegen radio type 2023-06-14 16:24:10 +08:00
Zhe
ae8397422a 修复PG数据库部分字典数据缺失；修复因字段无默认值无法直接运行生成SQL问题 2023-06-14 16:16:56 +08:00
xingyu
e23fb5024a fix: required = true 已过期 2023-06-14 15:21:41 +08:00
xingyu
573ad59edc Merge remote-tracking branch 'origin/master' into feature/mall_product 
# Conflicts:
#	yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/string/StrUtils.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/vo/ProductBrandBaseVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/vo/ProductCategoryBaseVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuBaseVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuBaseVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuRespVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuSimpleRespVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppProductSpuDetailRespVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppProductSpuPageItemRespVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/vo/TradeOrderBaseVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/vo/TradeOrderItemBaseVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/base/sku/AppProductSkuBaseRespVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/vo/AppTradeCartDetailRespVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/vo/AppTradeCartItemUpdateSelectedReqVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/vo/AppTradeCartResetReqVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderCreateReqVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderDetailRespVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderGetCreateInfoRespVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderPageItemRespVO.java
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/address/vo/AppAddressBaseVO.java
 2023-06-14 15:18:12 +08:00
Syriana钟亨
df6d63068d
fix：修改第1点描述错误， 【用户看到 】改为 【用户看不到】 
Signed-off-by: Syriana钟亨 <4916681+sairupe@user.noreply.gitee.com>
 2023-06-13 08:36:20 +00:00
puhui999
60172274ec fix：合并代码后修改差异完善商品评论相关 2023-06-12 17:02:46 +08:00
dhb52
70b48ca232
使用docker compose -T来执行数据导入 
Signed-off-by: dhb52 <dhb52@126.com>
 2023-06-12 08:32:26 +00:00
puhui999
5cfcaa1a6e Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 
# Conflicts:
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/comment/AppCommentController.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/comment/vo/AppProductCommentBaseVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/comment/vo/AppProductCommentRespVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/AppProductSpuController.java
#	yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/comment/ProductCommentServiceImplTest.java
 2023-06-12 12:18:27 +08:00
puhui999
9ff873fe53 fix：完善商品评论测试 sql 2023-06-12 12:09:16 +08:00
puhui999
20100aa78b fix：完善商品评论 2023-06-12 12:08:55 +08:00
YunaiV
dcb1660880 mall + trade：code review 快递计算逻辑 2023-06-12 00:20:20 +08:00
YunaiV
e1a8e45ac7 mall + trade：快递价格计算 2023-06-11 23:40:38 +08:00
YunaiV
0c283ded5d Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-06-11 23:19:09 +08:00
YunaiV
b6c7a940be mall + promotion：增加秒杀活动的 mock 接口 2023-06-11 23:19:04 +08:00
jason
644d976a78 快递100 快递查询实现 2023-06-11 18:15:33 +08:00
jason
45e5578cb4 快递查询、 通过快递鸟查询实现 2023-06-11 10:22:33 +08:00
YunaiV
5ffc1ac9f3 mall + promotion：增加秒杀活动的 mock 接口 2023-06-11 00:22:45 +08:00
xiaqing
5f64fe052b 初始化sql 2023-06-10 20:45:31 +08:00
xiaqing
73d0e9d08a 初始化积分模块 
1.积分设置管理
2.积分签到规则管理
3.用户积分记录管理
4.用户签到积分管理
 2023-06-10 20:44:31 +08:00
YunaiV
4f5ac0edbb mall + promotion：增加营销活动的 mock 接口 2023-06-10 17:51:15 +08:00