526 Commits

Author SHA1 Message Date
0004f1f6fb fix:【crm 客户管理】修复线索池操操作日志显示空的问题 !1397 2025-08-09 10:04:07 +08:00
8ee1fef9e4 fix:【crm 客户管理】联系人删除时,校验权限不正确的问题 2025-08-02 19:41:59 +08:00
aefaff2cad fix:【bpm 工作流】BpmCategoryServiceImplTest 单测不正确的问题 2025-07-31 09:56:34 +08:00
f71ec38456 【同步】BOOT 和 CLOUD 的功能 2025-07-30 19:06:44 +08:00
b8889a94c7 !1362 feat: 使用 fastExcel 替换 easyExcel (<a href="https://gitee.com/link?target=https%3A%2F%2Fgithub.com%2Ffast-excel%2Ffastexcel">https://github.com/fast-excel/fastexcel</a>)
Merge pull request !1362 from xingyu/master-jdk17-excel
2025-07-26 09:20:20 +00:00
d128d78718 reactor:easy-trans 默认禁用,避免影响接口性能 2025-07-23 22:17:54 +08:00
c96f6bb360 fix:【CRM 客户管理】CRM 超管,无法强制转移数据的问题 2025-07-14 13:19:14 +08:00
af94536a06 fix:【CRM 客户管理】修改数据时,避免操作日志出现“删除负责人”的情况 2025-07-14 13:10:51 +08:00
f38485ffd5 Merge branch 'refs/heads/master-jdk17' into master-jdk17-excel
# Conflicts:
#	yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/handler/SelectSheetWriteHandler.java
2025-06-15 18:54:13 +08:00
02872e0826 !1360 修复CRM模块,添加日志记录时,bizNo少了一个括号,会造成异常的问题 2025-06-15 10:06:54 +08:00
9dec02d02e feat: 使用 fastExcel 替换 easyExcel (https://github.com/fast-excel/fastexcel) 2025-06-10 14:51:41 +08:00
129f9175ac feat: 优化语句 2025-06-02 21:55:03 +08:00
1b37c47361 fix: deleteBatchIds 已过期 2025-05-26 14:09:31 +08:00
5caf990920 fix: selectBatchIds 已过期 2025-05-26 14:06:02 +08:00
e3ab3895b7 reactor:移除 crm 的 api 包 2025-05-16 09:45:15 +08:00
b758e690c1 reactor:移除 system 和 infra 的 api 包 2025-05-15 00:08:11 +08:00
6c6babb4c3 reactor:yudao-common 增加 biz 包,将 framework 依赖的 api 统一迁移,方便后续 yudao-framework 独立仓库 2025-05-14 19:23:40 +08:00
0cd831d5f5 fix:【CRM】receiveContactLog 记录日志不正确的问题 2025-05-13 09:55:19 +08:00
b634a1e97b 【缺陷修复】CRM:修复跟进日志的操作日志记录失败 2025-03-23 16:54:48 +08:00
eb7269083a Merge branch 'feature/iot' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk17 2025-03-17 08:54:10 +08:00
2d18f593ae V2.4.1 发布~ 2025-02-09 12:33:24 +08:00
bb11fdd3fa Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/iot
# Conflicts:
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/thinkmodelfunction/IotThinkModelFunctionController.http
2025-02-09 07:23:17 +08:00
4e43958fe3 fix typo: adminTenentId -> adminTenantId, appTenentId -> appTenantId 2025-02-05 11:42:59 +08:00
8236154ae8 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/iot
# Conflicts:
#	yudao-dependencies/pom.xml
#	yudao-module-iot/yudao-module-iot-api/src/main/java/cn/iocoder/yudao/module/iot/enums/product/IotProductStatusEnum.java
#	yudao-module-iot/yudao-module-iot-api/src/main/java/cn/iocoder/yudao/module/iot/enums/thingmodel/IotThingModelTypeEnum.java
2025-01-28 03:54:16 +08:00
d83b7cd5b9 【代码优化】InEnum 不必须指定 int 类型,通过泛型指定 2025-01-24 17:31:41 +08:00
c9904f0994 【代码评审】IoT:ThingModel 维护 2024-12-28 21:06:19 +08:00
4a8d146422 fix:修复CRM模块待办列表和数据权限BUG。 2024-12-01 15:58:35 +08:00
b478eb9f08 fix:修复CRM模块待办列表和数据权限BUG。 2024-11-28 10:09:36 +08:00
d893bb4adf fix: LogRecord表达式有误
Signed-off-by: dhb52 <dhb52@126.com>
2024-11-25 16:32:21 +00:00
d50844246c 【缺陷修复】CRM:上级无法读取下级的数据问题
① CrmPermissionUtils 解决分页过滤
② CrmPermissionAspect 解决查询详情过滤
2024-10-02 11:13:21 +08:00
7cbd447b69 【代码优化】CRM:移除多余的 selectBatchIds 逻辑 2024-10-02 10:51:06 +08:00
945d379625 【代码优化】CRM:数据权限拼接时,把 pool 条件拿回到 customer 里,只有它有公海逻辑 2024-10-02 09:25:09 +08:00
12ce87b305 【功能修复】框架:操作日志异步记录时,丢失 request 的问题 2024-09-06 21:43:59 +08:00
9d26381dcc 【代码优化】增强 JDK17、JDK8 之间的兼容性 2024-08-26 12:32:54 +08:00
87126d8385 【功能修复】CRM:回款管理导出报错的问题 2024-07-26 22:37:35 +08:00
4de27eb12d 【依赖】easy-trans from 1.6.6 to 1.7.8 2024-07-15 12:38:23 +08:00
b586a09b90 !1011 新增 mall 客服
Merge pull request !1011 from 芋道源码/develop
2024-07-13 04:11:46 +00:00
97e8c35f70 【修复】CRM:CrmBusinessStatusDO 缺少 BaseDO 2024-06-04 19:39:11 +08:00
4a0ad205ae 【代码评审】CRM:优化员工业绩统计的实现 2024-05-11 22:30:37 +08:00
95a8aa9ba9 Merge branch 'develop' of https://gitee.com/scholarli/ruoyi-vue-pro_1 into develop
# Conflicts:
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/statistics/CrmStatisticsPerformanceServiceImpl.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/resources/mapper/statistics/CrmStatisticsPerformanceMapper.xml
2024-05-11 22:07:43 +08:00
99ab07de69 完成todo xml部分 2024-05-11 11:35:27 +08:00
52c86cd290 【优化】CRM:员工业绩统计的实现 2024-05-07 23:08:38 +08:00
d0d1d6d208 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop 2024-05-07 22:48:39 +08:00
408378f5ab Merge branch 'develop' of https://gitee.com/scholarli/ruoyi-vue-pro_1 into develop
# Conflicts:
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/statistics/CrmStatisticsPerformanceServiceImpl.java
2024-05-07 22:32:12 +08:00
3afd2cba0c 完成todo部分,优化环比同比数据的计算。 2024-05-04 22:24:23 +08:00
ebd5ba02d2 【优化】CRM:增加对 JDK8 的兼容性,使用 ListUtil 替代 List of 2024-05-04 09:36:15 +08:00
f381568f6b 【修复】CRM:商机添加商品时,businessProducts 参数错误,应该是 products 2024-05-03 10:35:58 +08:00
ab00986a1d Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk17 2024-05-01 08:37:56 +08:00
9a2eb2d02c Merge remote-tracking branch 'refs/remotes/yudao/develop' into develop 2024-04-25 23:16:52 +08:00
0808bdaa41 fix: CRM 管理员数据权限 bug 2024-04-25 23:16:34 +08:00