芋道源码
|
1f93ac25b6
|
!933 修正 swagger 文档错误
Merge pull request !933 from moon69/master
|
2024-04-14 14:03:57 +00:00 |
|
芋道源码
|
7f8d3b31d8
|
!939 updateCommentVisible 应该用前端传入的显示值
Merge pull request !939 from 云扬四海/fix_comment_bug
|
2024-04-14 13:58:26 +00:00 |
|
芋道源码
|
ddf25d24a9
|
!945 bugfix：修复获取登录用户的权限信息接口在没有授权角色时，没有菜单列表导致报错的问题
Merge pull request !945 from a472159403/bug_getMenuList
|
2024-04-14 13:57:30 +00:00 |
|
芋道源码
|
002e5a4b25
|
!938 修复创建跟进记录bug
Merge pull request !938 from dftba_effy/master
|
2024-04-14 13:55:26 +00:00 |
|
lihaiyang
|
85cd07aa87
|
bugfix：修复获取登录用户的权限信息接口在没有授权角色时，没有菜单列表导致报错的问题
|
2024-04-13 23:30:34 +08:00 |
|
YunaiV
|
8e86706d50
|
同步 develop 最新代码
|
2024-04-12 20:31:33 +08:00 |
|
YunaiV
|
b44eab7f93
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/business/CrmBusinessTransferReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contact/vo/CrmContactTransferReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/vo/contract/CrmContractTransferReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/customer/CrmCustomerTransferReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/permission/CrmPermissionController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/permission/CrmPermissionServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/CrmReceivablePlanServiceImpl.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/vo/AppCartAddReqVO.java
|
2024-04-12 19:18:30 +08:00 |
|
YunaiV
|
62c6c4b9bd
|
同步 develop 最新代码
|
2024-04-12 19:17:49 +08:00 |
|
YunaiV
|
9cba258d8f
|
Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk21
|
2024-04-12 19:14:56 +08:00 |
|
芋道源码
|
2038e5204a
|
!943 回退 'Pull Request !937 : feat: 客户成交周期分析(按区域、按产品)'
Merge pull request !943 from 芋道源码/revert-merge-937-develop
|
2024-04-12 11:13:59 +00:00 |
|
芋道源码
|
48aef10d2d
|
回退 'Pull Request !937 : feat: 客户成交周期分析(按区域、按产品)'
|
2024-04-12 11:13:11 +00:00 |
|
芋道源码
|
decdfb2aa7
|
!937 feat: 客户成交周期分析(按区域、按产品)
Merge pull request !937 from dhb52/develop
|
2024-04-12 11:11:30 +00:00 |
|
YunaiV
|
048c6ed7b9
|
移除 resilience4j 组件
|
2024-04-11 22:53:05 +08:00 |
|
YunaiV
|
1904f8ca88
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2024-04-11 22:52:53 +08:00 |
|
YunaiV
|
1e348dbf83
|
【优化】将项目的 annotations 统一修改成 annotation 包
|
2024-04-11 22:52:34 +08:00 |
|
YunaiV
|
ceaf192bf2
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# README.md
|
2024-04-11 22:45:07 +08:00 |
|
YunaiV
|
cc50891632
|
【新增】RateLimiter 限流器，支持全局、用户、IP 等级别的限流
|
2024-04-11 22:43:37 +08:00 |
|
YunaiV
|
51999be6b0
|
移除 resilience4j 组件
|
2024-04-10 21:01:15 +08:00 |
|
YunaiV
|
cc9b2e86b6
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-dependencies/pom.xml
# yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/handler/GlobalExceptionHandler.java
|
2024-04-10 20:58:35 +08:00 |
|
YunaiV
|
2e03dcba69
|
移除 resilience4j 组件
|
2024-04-10 20:57:44 +08:00 |
|
YunaiV
|
3dbb714d12
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2024-04-10 20:40:47 +08:00 |
|
YunaiV
|
38db5fe008
|
【新增】新增 UserIdempotentKeyResolver 解析器，支持用户级别的幂等
|
2024-04-10 20:13:31 +08:00 |
|
YunaiV
|
3bbbf8db11
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2024-04-10 13:03:46 +08:00 |
|
YunaiV
|
321f71de73
|
重构 LocalDateTimeDeserializer 和 LocalDateTimeSerializer 的命名，可读性更好
|
2024-04-10 13:03:20 +08:00 |
|
yunlongn
|
325c03dfd4
|
updateCommentVisible 应该用前端传入的显示值
|
2024-04-09 16:35:41 +08:00 |
|
lijiahuan
|
0624bfcaf5
|
修复新建跟进记录bug
|
2024-04-09 11:57:26 +08:00 |
|
dhb52
|
d9407ab40a
|
feat: 客户成交周期分析(按区域、按产品)
|
2024-04-09 00:07:42 +08:00 |
|
dhb52
|
286e24ad6c
|
Merge remote-tracking branch 'origin/develop' into develop
|
2024-04-08 22:33:39 +08:00 |
|
YunaiV
|
c4ce9068f9
|
crm：code review 公海客户分析
|
2024-04-07 21:27:40 +08:00 |
|
YunaiV
|
ee40b53016
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop
|
2024-04-07 21:18:46 +08:00 |
|
芋道源码
|
60ac63416a
|
!934 增加公海客户分析(mapper模拟数据)
Merge pull request !934 from dhb52/develop
|
2024-04-07 12:39:38 +00:00 |
|
YunaiV
|
81100929dd
|
【优化】支持登陆用户，直接读取昵称、部门等信息，也支持自定义字段
|
2024-04-07 19:47:54 +08:00 |
|
YunaiV
|
159de065ff
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2TokenServiceImpl.java
# yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2TokenServiceImplTest.java
|
2024-04-07 19:40:07 +08:00 |
|
YunaiV
|
909d3309d2
|
【优化】支持登陆用户，直接读取昵称、部门等信息，也支持自定义字段
|
2024-04-07 19:39:32 +08:00 |
|
YunaiV
|
6fa3ea8514
|
bugfix：YudaoOperateLogV2Configuration 重命名为 YudaoOperateLogConfiguration
|
2024-04-06 17:55:33 +08:00 |
|
dhb52
|
84140c52b0
|
fix: LocalDateTimeUtils.getDateRangeList计算季度区间有误
|
2024-04-06 15:14:20 +08:00 |
|
dhb52
|
44c22e1ef5
|
wip: 增加公海客户分析(mapper模拟数据)
|
2024-04-06 14:49:37 +08:00 |
|
dhb52
|
d2f48eb259
|
Merge remote-tracking branch 'origin/develop' into develop
|
2024-04-06 14:45:36 +08:00 |
|
dhb52
|
dfe11eb4c0
|
fix: [CRM-客户统计]增加times[]时间范围校验
|
2024-04-06 14:44:03 +08:00 |
|
dhb52
|
1121c21c8b
|
fix: [CRM-客户统计]按客户创建时间筛选,关联合同是否有成交记录,有则视为[成交客户]
|
2024-04-06 14:44:03 +08:00 |
|
moon69
|
fee600ef1b
|
修正 swagger 文档错误
|
2024-04-06 13:01:19 +08:00 |
|
YunaiV
|
d5d5c3cbeb
|
bugfix：Spring Cache 自定义过期时间，在多租户场景下，会额外拼接 # 的问题
|
2024-04-06 11:27:00 +08:00 |
|
jason
|
32809c3edb
|
仿钉钉流程设计-仿钉钉快搭模型 JSON数据的保存
|
2024-04-05 22:49:34 +08:00 |
|
dhb52
|
3ca453c0da
|
fix: [CRM-客户统计]增加times[]时间范围校验
|
2024-04-05 15:59:11 +08:00 |
|
dhb52
|
e18d26d8a6
|
fix: [CRM-客户统计]按客户创建时间筛选,关联合同是否有成交记录,有则视为[成交客户]
|
2024-04-05 14:59:00 +08:00 |
|
YunaiV
|
05af77b786
|
crm：code review 客户画像
|
2024-04-05 14:44:00 +08:00 |
|
芋道源码
|
9ea43ce55a
|
!932 CRM: 完善用户画像数据统计
Merge pull request !932 from puhui999/develop
|
2024-04-05 05:55:15 +00: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 |
|
芋道源码
|
5666121daf
|
!931 fix: 按Code-Review修改CrmStatisticsCustomerMapper.xml
Merge pull request !931 from dhb52/develop
|
2024-04-05 05:22:59 +00:00 |
|
jason
|
d9758636b1
|
仿钉钉流程设计-抄送节点实现
|
2024-04-05 12:59:37 +08:00 |
|