Commit Graph

285 Commits

Author SHA1 Message Date
YunaiV
b5af357dfc 同步最新的 bugfix 2024-04-17 21:29:04 +08:00
YunaiV
9b9f54bb03 Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop
# Conflicts:
#	yudao-dependencies/pom.xml
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/CrmCustomerController.java
#	yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseOrderController.java
2024-04-05 13:32:17 +08:00
YunaiV
20583417a4 【重构】V2 操作日志转正,基于注解的可使用变量、可以自定义函数的通用操作日志组件 2024-04-04 01:49:49 +08:00
YunaiV
a80ba48889 bugfix:同步 master 修改的 bug 2024-03-28 19:05:16 +08:00
YunaiV
1f4889c68e 全局:将 dict 组件,融合到 excel 组件里,减少 starter 2024-02-28 21:42:32 +08:00
YunaiV
067ff6cc4d bugfix master 的一些 pr 2024-02-27 21:01:02 +08:00
YunaiV
c6c8dddfec 📖 CRM:code review 跟进记录 2024-01-20 19:05:16 +08:00
puhui999
7914423c66 CRM: 完善跟进 TODO 2024-01-20 14:56:31 +08:00
puhui999
ff9cef6a92 CRM: 完善跟进,新增跟进信息处理器 handler 接口✔ 2024-01-17 12:00:51 +08:00
YunaiV
64e1d68923 📖 CRM:待办事项的 code review 2024-01-15 12:15:52 +08:00
YunaiV
50f7be9976 MALL:简化商评论的 VO 转化,去除无用的接口 2024-01-14 13:21:13 +08:00
YunaiV
ed34b18d82 MALL:简化商品分类的 VO 转化 2024-01-13 22:58:24 +08:00
YunaiV
8b3bfcbd6b 📖 MALL:code review 商品浏览记录 2024-01-13 20:23:58 +08:00
YunaiV
bbee720710 📖 CRM:code review 拼团记录的实现 2024-01-13 19:34:49 +08:00
芋道源码
1b87b8a42f
!822 接入拼团
Merge pull request !822 from 疯狂的世界/develop
2024-01-13 03:20:25 +00:00
YunaiV
bf966cd610 MALL:简化 SPU 属性 的 VO 转化 2024-01-12 23:18:00 +08:00
YunaiV
f6c8159dac MALL:简化 SPU 的 VO 转化 2024-01-12 22:48:58 +08:00
YunaiV
fe5c5e4223 MALL:调整商品 SPU 字段,简化部分接口 2024-01-12 21:01:44 +08:00
owen
30fce2911f Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/history/AppProductBrowseHistoryController.java
2024-01-11 11:11:05 +08:00
owen
df609df2cf 商品:修正浏览记录 2024-01-11 00:25:55 +08:00
YunaiV
63db275af1 MALL:默认异步记录商品访问日志、访问次数 2024-01-08 19:14:09 +08:00
YunaiV
bbba83ef61 📖 MALL:code review 商品统计的代码 2024-01-07 16:23:02 +08:00
YunaiV
eb048532f7 Merge branch 'develop' of https://gitee.com/CrazyWorld/ruoyi-vue-pro into develop
# Conflicts:
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/article/AppArticleController.java
2024-01-06 21:52:10 +08:00
YunaiV
a259e032e1 MALL:增加商品列表的分类编号数组、商品编号的筛选 2024-01-06 20:42:32 +08:00
owen
0944584029 商品:用户未登录时,不记录商品浏览记录 2023-12-19 21:44:04 +08:00
owen
0b7d42482f 统计:增加商品统计定时任务 2023-12-17 19:30:50 +08:00
owen
f374e778bb 商品:增加商品浏览记录 2023-12-17 17:20:08 +08:00
YunaiV
e1bb546460 MALL:1)优惠劵增加返回使用范围;2)商品分类增加 id 批量查询 2023-12-16 18:32:54 +08:00
YunaiV
07e610b3f7 🔥 MALL:移除商品收藏的批量操作接口,由前端自身 for 处理 2023-12-15 00:02:40 +08:00
YunaiV
8913572e51 🐛 修复创建订单评论的 scores、replyStatus 默认值未填写的问题 2023-12-14 22:00:04 +08:00
YunaiV
e71867683e 📖 MALL:调整接口文档的说明 2023-12-12 12:11:28 +08:00
YunaiV
98697ee075 ⬆️ 2023-12-07 20:48:11 +08:00
胡桃云
160e3584d3 商城-商品库存为零可以展示商品列表 2023-12-06 20:27:23 +08:00
YunaiV
eeeafcc10c 1.9.0 版本发布 2023-11-30 21:14:13 +08:00
YunaiV
c7a21b2a64 mall:优化商品收藏的分页接口 2023-11-19 00:58:12 +08:00
芋道源码
867293a4f9
!724 会员中心商品收藏
Merge pull request !724 from niou233/feature/mall_product_org
2023-11-18 16:40:00 +00:00
owen
330380c2d0 营销:适配商城装修组件【商品卡片】 2023-11-17 09:56:52 +08:00
niou233
5a5a42463b refactor: 会员商品收藏 2023-11-08 17:22:00 +08:00
niou233
92be763c6f refactor: 会员商品收藏 2023-11-08 17:18:28 +08:00
niou233
670c0962a7 refactor: 会员商品收藏 2023-11-08 17:03:37 +08:00
niou233
cbaadc3a77 Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product_org 2023-11-08 14:39:01 +08:00
niou233
5facac7330 refactor: 会员商品收藏 2023-11-08 14:37:18 +08:00
niou233
daa7d14b09 reafactor: 会员商品收藏 2023-11-08 14:36:44 +08:00
dongshanshan
98aae5ed1a feat: 会员商品收藏 2023-10-31 16:51:56 +08:00
YunaiV
52e735f360 Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/api/coupon/CouponTemplateApiImpl.java
2023-10-24 19:09:01 +08:00
puhui999
3672d0f245 商品模块移除对营销模块的依赖 2023-10-23 17:29:26 +08:00
YunaiV
a778c25075 product:优化代码实现,简化重复判空 2023-10-22 21:44:05 +08:00
YunaiV
0db4581030 code review:签到逻辑 2023-10-21 19:56:53 +08:00
puhui999
283ca908b7 SPU: 完善选择优惠卷 2023-10-20 16:35:49 +08:00
puhui999
6e11154010 SPU: 添加选择优惠卷 2023-10-20 11:35:16 +08:00