lxd/FlowPacs
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,847 Commits 2 Branches 0 Tags 165 MiB
4f310cf310
Commit Graph

6847 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
YunaiV
2d1e57554d 📖 CRM：code review CRM 客户逻辑 2024-01-07 22:07:17 +08:00
芋道源码
3c7f63c356
!810 fix：修复 issues 提到的一些公众号上的问题 
Merge pull request !810 from puhui999/develop
 2024-01-07 13:23:53 +00:00
YunaiV
df9ff3fc5c 🐛 MALL：修复 issue 提到的 bug 2024-01-07 20:51:57 +08:00
芋道源码
761ab8a0e5
!809 修复BUG， 会员当前有等级的时候下订单会把当前等级给清空了。 
Merge pull request !809 from 云扬四海/fix-member-level-bug-0102
 2024-01-07 12:47:46 +00:00
芋道源码
d728c36c1e
!811 修复订单操作日志中快递公司名称模板与数据对不上的问题 
Merge pull request !811 from 杨宇庆/N/A
 2024-01-07 12:45:01 +00:00
YunaiV
19d5a0c2aa 📖 CRM：code review crm 联系人新增操作日志 2024-01-07 18:19:08 +08:00
芋道源码
450cd1baf1
!817 crm联系人新增操作日志 
Merge pull request !817 from zyna/develop
 2024-01-07 08:27:28 +00: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
zyna
44d828023c crm联系人新增操作日志 2024-01-06 21:06:38 +08:00
YunaiV
a259e032e1 ✨ MALL：增加商品列表的分类编号数组、商品编号的筛选 2024-01-06 20:42:32 +08:00
puhui999
68f5edaa88 CRM-客户: 完善一些 TODO 2024-01-06 15:28:10 +08:00
puhui999
3170e7fd97 CRM-客户: 简化客户公海配置 VO，完善相关操作日志 2024-01-06 13:48:22 +08:00
puhui999
9ce50ec369 CRM-客户限制配置：VO 简化 2024-01-06 13:04:30 +08:00
puhui999
269816446a CRM-客户：日志表达式调整 2024-01-06 12:27:30 +08:00
YunaiV
f73cb540cf ✨ MALL：去除分销提现的银行配置 2024-01-05 22:46:35 +08:00
puhui999
a1c17b9b00 CRM-客户：日志表达式调整 2024-01-05 17:40:21 +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
puhui999
d8bb55fc0b CRM-客户：完善操作日志 2024-01-05 14:43:48 +08:00
YunaiV
1ae535fc87 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2024-01-05 01:31:14 +08:00
YunaiV
3091a0882f Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2024-01-05 01:29:57 +08:00
YunaiV
ee250c74d6 ✨ MALL：更新 uni-app + Vue3 实现 2024-01-05 01:28:39 +08:00
puhui999
ea4b4b8956 CRM-客户：精简 VO 2024-01-05 00:15:26 +08:00
puhui999
e6f4c1f0d5 Merge remote-tracking branch 'yudao/develop' into develop 2024-01-04 09:59:50 +08:00
YunaiV
a974d055b6 📖 CRM：【还款】code review 还款的代码，补全对应的 todo list 2024-01-04 09:41:58 +08:00
YunaiV
c6a9751511 📖 CRM：【合同】code review 合同的代码，补全对应的 todo list 2024-01-04 09:18:44 +08:00
YunaiV
2668e0cfeb 📖 CRM：【产品】code review 产品的代码，补全对应的 todo list 2024-01-04 08:01:04 +08:00
YunaiV
b9f1e8ffaf 📖 CRM：【联系人】code review 商机的代码，补全对应的 todo list 2024-01-04 07:53:00 +08:00
杨宇庆
9e895c8af1
修复订单操作日志中快递公司名称模板与数据对不上的问题 
cn.iocoder.yudao.module.trade.enums.order.TradeOrderOperateTypeEnum中ADMIN_DELIVERY为deliveryName

Signed-off-by: 杨宇庆 <hiyyq@qq.com>
 2024-01-03 18:50:23 +00:00
YunaiV
02324f9e60 ✨ CRM：【联系人】统一字段 2024-01-03 23:30:25 +08:00
YunaiV
cff6e520ee 📖 CRM：【联系人】code review 联系人的代码，补全对应的 todo list 2024-01-03 22:07:20 +08:00
YunaiV
f8f5e525be ✨ CRM：新增跟进记录表 2024-01-03 20:56:28 +08:00
YunaiV
2e7c3e09a9 📖 CRM：code review 所有代码，补充对应 todo 2024-01-03 19:38:13 +08:00
YunaiV
d0df0e8e16 📖 CRM：【客户】优化锁定客户的逻辑实现 2024-01-03 13:06:49 +08:00
puhui999
e18ac461ea fix: 修复公众号模块，当粉丝第一次关注的时候会出现错误（公众号粉丝不存在） 2024-01-03 11:11:20 +08:00
puhui999
90bdc1fd83 fix: 修复公众号统计接口字符串日期转 localDateTime 报错的问题 2024-01-03 10:09:41 +08:00
YunaiV
0253846fdf Merge branch 'develop' of https://gitee.com/zh8790/ruoyi-vue-pro_develop into develop 
# Conflicts:
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerServiceImpl.java
 2024-01-02 22:21:14 +08:00
YunaiV
1da8006af3 📖 CRM：【客户】完善列表、新增、修改接口的 todo 2024-01-02 21:45:02 +08:00
YunaiV
9e3055ee1e 📖 CRM：code review 商机模块 2024-01-02 18:49:14 +08:00
yunlongn
39d26cc84d 会员当前有等级的时候下订单会把当前等级清空得bug修复 2024-01-02 15:33:13 +08:00
YunaiV
2d0537387b Merge branch 'develop' of https://gitee.com/zyna/ruoyi-vue-pro into develop 
# Conflicts:
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contact/CrmContactBusinessLinkServiceImpl.java
 2023-12-30 21:43:04 +08:00
YunaiV
8c9b483ac5 📖 code review 操作日志的实现 2023-12-30 21:36:46 +08:00
芋道源码
9c3cf1d6b6
!806 操作日志：完善 code review 提到的问题 
Merge pull request !806 from puhui999/develop
 2023-12-30 12:14:40 +00:00
YunaiV
290f45dd6e Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop 
# Conflicts:
#	yudao-server/src/main/resources/application-local.yaml
 2023-12-30 20:11:07 +08:00
YunaiV
6c0978407b Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	yudao-dependencies/pom.xml
 2023-12-30 19:23:35 +08:00
YunaiV
8a947990f4 🐛 升级 easyexcel 依赖，解决 JDK21 导出报错 2023-12-30 19:22:58 +08:00
YunaiV
5946bddff8 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	yudao-framework/yudao-spring-boot-starter-flowable/src/main/java/cn/iocoder/yudao/framework/flowable/config/YudaoFlowableConfiguration.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmModelServiceImpl.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmProcessDefinitionServiceImpl.java
#	yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/jmreport/core/service/JmReportTokenServiceImpl.java
 2023-12-30 13:13:21 +08:00
YunaiV
a98d00a7fe Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2023-12-30 12:01:25 +08:00
YunaiV
2fb36563ec 🐛 修复 CacheUtils 异步缓存的 ThreadLocal 变量传递 2023-12-30 12:01:12 +08:00
YunaiV
81c726542b Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2023-12-30 11:24:15 +08:00