YunaiV
|
ec0c4eebdb
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# pom.xml
# yudao-dependencies/pom.xml
|
2025-11-24 17:03:53 +08:00 |
|
YunaiV
|
aa72a94428
|
fix：【crm】移除 CrmReceivablePlanRespVO 中的 ExcelProperty 注解，修复导出报错
|
2025-11-22 08:53:44 +08:00 |
|
YunaiV
|
c80ffe437f
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/config/YudaoWebAutoConfiguration.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/IotSceneRuleServiceImpl.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/action/IotDeviceControlSceneRuleAction.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/IotSceneRuleMatcherManager.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/social/SocialClientServiceImpl.java
|
2025-10-02 18:52:15 +08:00 |
|
YunaiV
|
772326e7e2
|
feat：【crm 系统】线索查询时，增加 times 范围查询
|
2025-09-27 14:14:41 +08:00 |
|
YunaiV
|
269c1fdabf
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/config/YudaoTenantAutoConfiguration.java
# yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/security/TenantSecurityWebFilter.java
|
2025-08-31 10:08:12 +08:00 |
|
YunaiV
|
040899d8c9
|
reactor：移除 @Accessors 和 @EqualsAndHashCode 注解
|
2025-08-30 17:48:16 +08:00 |
|
YunaiV
|
93d0bf5ead
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/filter/CacheRequestBodyWrapper.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/api/mail/dto/MailSendSingleToUserReqDTO.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplateSendReqVO.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailSendServiceImpl.java
# yudao-module-system/src/test/java/cn/iocoder/yudao/module/system/service/mail/MailLogServiceImplTest.java
|
2025-08-17 15:00:52 +08:00 |
|
YunaiV
|
0004f1f6fb
|
fix：【crm 客户管理】修复线索池操操作日志显示空的问题 !1397
|
2025-08-09 10:04:07 +08:00 |
|
YunaiV
|
d3888d7b4a
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2025-08-03 19:46:21 +08:00 |
|
YunaiV
|
8ee1fef9e4
|
fix：【crm 客户管理】联系人删除时，校验权限不正确的问题
|
2025-08-02 19:41:59 +08:00 |
|
YunaiV
|
83537fd2d9
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# pom.xml
# yudao-dependencies/pom.xml
# yudao-module-bpm/src/test/java/cn/iocoder/yudao/module/bpm/service/category/BpmCategoryServiceImplTest.java
|
2025-07-31 13:50:09 +08:00 |
|
YunaiV
|
aefaff2cad
|
fix：【bpm 工作流】BpmCategoryServiceImplTest 单测不正确的问题
|
2025-07-31 09:56:34 +08:00 |
|
YunaiV
|
c4df87f7ee
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/handler/GlobalExceptionHandler.java
|
2025-07-30 19:07:46 +08:00 |
|
YunaiV
|
f71ec38456
|
【同步】BOOT 和 CLOUD 的功能
|
2025-07-30 19:06:44 +08:00 |
|
YunaiV
|
b208f100a6
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-dependencies/pom.xml
# yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/util/ExcelUtils.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserUpdateStatusReqVO.java
|
2025-07-26 17:25:10 +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 |
|
YunaiV
|
8cef02613d
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2025-07-23 22:23:10 +08:00 |
|
YunaiV
|
d128d78718
|
reactor：easy-trans 默认禁用，避免影响接口性能
|
2025-07-23 22:17:54 +08:00 |
|
YunaiV
|
adece67532
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/vo/file/FileUploadReqVO.java
# yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/app/file/vo/AppFileUploadReqVO.java
|
2025-07-15 22:37:27 +08:00 |
|
YunaiV
|
c96f6bb360
|
fix：【CRM 客户管理】CRM 超管，无法强制转移数据的问题
|
2025-07-14 13:19:14 +08:00 |
|
YunaiV
|
af94536a06
|
fix：【CRM 客户管理】修改数据时，避免操作日志出现“删除负责人”的情况
|
2025-07-14 13:10:51 +08:00 |
|
xingyu4j
|
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 |
|
YunaiV
|
7d867909d7
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# pom.xml
# sql/oracle/ruoyi-vue-pro.sql
# sql/sqlserver/ruoyi-vue-pro.sql
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailAccountController.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailTemplateController.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notice/NoticeController.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/NotifyTemplateController.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/OAuth2ClientController.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/OAuth2TokenController.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/SmsChannelController.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/SmsTemplateController.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/socail/SocialClientController.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/TenantPackageController.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailAccountService.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailAccountServiceImpl.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailTemplateService.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailTemplateServiceImpl.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/notice/NoticeServiceImpl.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyTemplateService.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyTemplateServiceImpl.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2ClientService.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2ClientServiceImpl.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/sms/SmsChannelService.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/sms/SmsTemplateService.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/sms/SmsTemplateServiceImpl.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/tenant/TenantPackageService.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/tenant/TenantPackageServiceImpl.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/tenant/TenantService.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/tenant/TenantServiceImpl.java
|
2025-06-15 10:21:55 +08:00 |
|
YunaiV
|
02872e0826
|
!1360 修复CRM模块，添加日志记录时，bizNo少了一个括号，会造成异常的问题
|
2025-06-15 10:06:54 +08:00 |
|
xingyu4j
|
9dec02d02e
|
feat: 使用 fastExcel 替换 easyExcel (https://github.com/fast-excel/fastexcel)
|
2025-06-10 14:51:41 +08:00 |
|
xingyu4j
|
129f9175ac
|
feat: 优化语句
|
2025-06-02 21:55:03 +08:00 |
|
xingyu4j
|
1b37c47361
|
fix: deleteBatchIds 已过期
|
2025-05-26 14:09:31 +08:00 |
|
xingyu4j
|
5caf990920
|
fix: selectBatchIds 已过期
|
2025-05-26 14:06:02 +08:00 |
|
YunaiV
|
479dfb6c23
|
【同步】jdk21 和 jdk8 的代码
|
2025-05-19 20:12:12 +08:00 |
|
YunaiV
|
e00bfd02a1
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# pom.xml
# yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
# yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/operatelog/CrmOperateLogController.java
# yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/statistics/CrmStatisticsPerformanceController.java
# yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/statistics/vo/performance/CrmStatisticsPerformanceReqVO.java
# yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/statistics/CrmStatisticsPerformanceServiceImpl.java
# yudao-module-mall/yudao-module-promotion/pom.xml
# yudao-module-mall/yudao-module-trade/pom.xml
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/api/social/SocialUserApi.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/vo/AuthRegisterReqVO.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java
|
2025-05-17 14:14:23 +08:00 |
|
YunaiV
|
e3ab3895b7
|
reactor：移除 crm 的 api 包
|
2025-05-16 09:45:15 +08:00 |
|