huangge1199/vue-pro
1
0
Fork 0
mirror of https://gitee.com/huangge1199_admin/vue-pro.git synced 2024-12-02 12:11:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
6,385 Commits 1 Branch 0 Tags 176 MiB
e18d26d8a6
Commit Graph

963 Commits

Author SHA1 Message Date
YunaiV
5faa006dd0 bugfix：修复拼团详情错误传递 groupon_id 的问题 2024-03-30 15:28:46 +08:00
YunaiV
3b379d8cc0 Merge branch 'develop' of https://gitee.com/puhui999/ruoyi-vue-pro into develop 
# Conflicts:
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/statistics/CrmStatisticsCustomerController.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/statistics/CrmStatisticsCustomerServiceImpl.java
 2024-03-30 11:54:27 +08:00
YunaiV
a80ba48889 bugfix：同步 master 修改的 bug 2024-03-28 19:05:16 +08:00
puhui999
0dd36f6c5c MALL: fix 订单价格分摊 2024-03-10 19:07:24 +08:00
YunaiV
d556b29214 CRM：code review 权限的优化 2024-03-09 18:27:58 +08:00
YunaiV
dda0909843 🎉 2.0.1 版本发布！ 2024-03-01 20:01:16 +08:00
YunaiV
7ef7228f65 MALL：增加返回 vipPrice 减免金额 2024-03-01 19:21:03 +08:00
YunaiV
6b06bf8a3d bugfix MALL：已过期的优惠劵，还显示可以使用 2024-03-01 13:55:37 +08:00
YunaiV
da6e01f6b5 bugfix：运行失败的单测 
bugfix：PayOrderExtensionMapper 的 selectListByStatusAndCreateTimeGe 查询时间范围不对的问题
 2024-03-01 12:26:05 +08:00
YunaiV
8ff710e49d ✨ 同步 master 的一些 pr 代码变更 2024-03-01 09:00:43 +08:00
YunaiV
1f4889c68e ✨ 全局：将 dict 组件，融合到 excel 组件里，减少 starter 2024-02-28 21:42:32 +08:00
YunaiV
6dcb1277b3 ✨ 全局：迁移 pay 组件到 pay 模块，迁移 flowable 组件到 bpm 模块 2024-02-28 21:03:40 +08:00
YunaiV
067ff6cc4d ✨ bugfix master 的一些 pr 2024-02-27 21:01:02 +08:00
YunaiV
9ea7bde751 📖 ERP：增加 ERP 首页的统计 2024-02-18 19:05:40 +08:00
YunaiV
722223c659 Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop 
# Conflicts:
#	yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/comment/ProductCommentServiceImplTest.java
 2024-01-27 16:44:58 +08:00
YunaiV
23ef3c8ae0 📖 CRM：code review 跟进记录 2024-01-22 08:53:59 +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
YunaiV
6a6e95fcb6 ✨ 对齐 BOOT 与 CLOUD 的代码 2024-01-19 22:13:55 +08:00
YunaiV
023a7b14d8 ✨ 统一 JDK8 和 JDK21 相关代码 2024-01-19 12:38:57 +08:00
YunaiV
4c200eda92 ✨ MALL：清理多余的 MemberStatisticsDO 类 2024-01-18 00:00:42 +08:00
YunaiV
75f2b207a4 Merge remote-tracking branch 'origin/develop' into develop 2024-01-17 19:46:03 +08:00
YunaiV
dd0a2b73e8 ✨ MALL：清理多余的 decorate 类 2024-01-17 19:45:57 +08:00
芋道源码
adfbb1433c
!840 CRM: 完善跟进，新增跟进信息处理器 handler 接口✔ 
Merge pull request !840 from puhui999/develop
 2024-01-17 04:26:03 +00:00
puhui999
ff9cef6a92 CRM: 完善跟进，新增跟进信息处理器 handler 接口✔ 2024-01-17 12:00:51 +08:00
YunaiV
6dbc942cdd ✨ MALL：修复售后确认退款时，缺少退款描述信息 2024-01-16 22:41:37 +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
31a28cb40d Review代码修改 2024-01-11 12:38:17 +08:00
owen
d6b59743a3 营销：接入 APP 装修页面 2024-01-11 11:55:25 +08:00
owen
680718c78f 营销：统一装修预览图片字段名称 2024-01-11 11:21:24 +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
2ab2b510cc 营销：修正拼团接口名称 2024-01-11 00:26:22 +08:00
owen
df609df2cf 商品：修正浏览记录 2024-01-11 00:25:55 +08:00
YunaiV
63db275af1 ✨ MALL：默认异步记录商品访问日志、访问次数 2024-01-08 19:14:09 +08:00
YunaiV
772b794374 📖 CRM：code review CRM 产品分类 2024-01-08 19:08:03 +08:00
YunaiV
df9ff3fc5c 🐛 MALL：修复 issue 提到的 bug 2024-01-07 20:51:57 +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
YunaiV
f73cb540cf ✨ MALL：去除分销提现的银行配置 2024-01-05 22:46:35 +08:00
owen
9203f485e9 Merge remote-tracking branch 'origin/develop' 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-05 15:40:29 +08:00
芋道源码
9c3cf1d6b6
!806 操作日志：完善 code review 提到的问题 
Merge pull request !806 from puhui999/develop
 2023-12-30 12:14:40 +00:00