6820 Commits (b30c865dad98352c1683872f6681af7ba5ca5d86)
 

Author SHA1 Message Date
YunaiV 5159da30b4 crm:code review 员工客户分析 2 years ago
芋道源码 0d1e2c604d
!944 feat: 客户成交周期分析(按区域、按产品)
Merge pull request !944 from dhb52/develop
2 years ago
puhui999 20b4bfd1b0 CRM: 完善新增商机分析 2 years ago
puhui999 fc3cdc4499 Merge remote-tracking branch 'refs/remotes/yudao/develop' into develop 2 years ago
lihaiyang 85cd07aa87 bugfix:修复获取登录用户的权限信息接口在没有授权角色时,没有菜单列表导致报错的问题 2 years ago
puhui999 6c9a3b0e11 CRM: 完善销售漏斗分析 2 years ago
dhb52 67b02c7e5b feat: 客户成交周期分析(按区域、按产品) 2 years ago
YunaiV 8e86706d50 同步 develop 最新代码 2 years ago
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
2 years ago
YunaiV 62c6c4b9bd 同步 develop 最新代码 2 years ago
YunaiV 9cba258d8f Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk21 2 years ago
芋道源码 2038e5204a
!943 回退 'Pull Request !937 : feat: 客户成交周期分析(按区域、按产品)'
Merge pull request !943 from 芋道源码/revert-merge-937-develop
2 years ago
芋道源码 48aef10d2d
回退 'Pull Request !937 : feat: 客户成交周期分析(按区域、按产品)' 2 years ago
芋道源码 decdfb2aa7
!937 feat: 客户成交周期分析(按区域、按产品)
Merge pull request !937 from dhb52/develop
2 years ago
YunaiV 048c6ed7b9 移除 resilience4j 组件 2 years ago
YunaiV 1904f8ca88 Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2 years ago
YunaiV 1e348dbf83 【优化】将项目的 annotations 统一修改成 annotation 包 2 years ago
YunaiV ceaf192bf2 Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
#	README.md
2 years ago
YunaiV cc50891632 【新增】RateLimiter 限流器,支持全局、用户、IP 等级别的限流 2 years ago
YunaiV 51999be6b0 移除 resilience4j 组件 2 years ago
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
2 years ago
YunaiV 2e03dcba69 移除 resilience4j 组件 2 years ago
YunaiV 3dbb714d12 Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2 years ago
YunaiV 38db5fe008 【新增】新增 UserIdempotentKeyResolver 解析器,支持用户级别的幂等 2 years ago
YunaiV 3bbbf8db11 Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2 years ago
YunaiV 321f71de73 重构 LocalDateTimeDeserializer 和 LocalDateTimeSerializer 的命名,可读性更好 2 years ago
yunlongn 325c03dfd4 updateCommentVisible 应该用前端传入的显示值 2 years ago
lijiahuan 0624bfcaf5 修复新建跟进记录bug 2 years ago
dhb52 d9407ab40a feat: 客户成交周期分析(按区域、按产品) 2 years ago
dhb52 286e24ad6c Merge remote-tracking branch 'origin/develop' into develop 2 years ago
YunaiV c4ce9068f9 crm:code review 公海客户分析 2 years ago
YunaiV ee40b53016 Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop 2 years ago
芋道源码 60ac63416a
!934 增加公海客户分析(mapper模拟数据)
Merge pull request !934 from dhb52/develop
2 years ago
YunaiV 81100929dd 【优化】支持登陆用户,直接读取昵称、部门等信息,也支持自定义字段 2 years ago
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
2 years ago
YunaiV 909d3309d2 【优化】支持登陆用户,直接读取昵称、部门等信息,也支持自定义字段 2 years ago
YunaiV 6fa3ea8514 bugfix:YudaoOperateLogV2Configuration 重命名为 YudaoOperateLogConfiguration 2 years ago
dhb52 84140c52b0 fix: LocalDateTimeUtils.getDateRangeList计算季度区间有误 2 years ago
dhb52 44c22e1ef5 wip: 增加公海客户分析(mapper模拟数据) 2 years ago
dhb52 d2f48eb259 Merge remote-tracking branch 'origin/develop' into develop 2 years ago
dhb52 dfe11eb4c0 fix: [CRM-客户统计]增加times[]时间范围校验 2 years ago
dhb52 1121c21c8b fix: [CRM-客户统计]按客户创建时间筛选,关联合同是否有成交记录,有则视为[成交客户] 2 years ago
moon69 fee600ef1b 修正 swagger 文档错误 2 years ago
YunaiV d5d5c3cbeb bugfix:Spring Cache 自定义过期时间,在多租户场景下,会额外拼接 # 的问题 2 years ago
jason 32809c3edb 仿钉钉流程设计-仿钉钉快搭模型 JSON数据的保存 2 years ago
dhb52 3ca453c0da fix: [CRM-客户统计]增加times[]时间范围校验 2 years ago
dhb52 e18d26d8a6 fix: [CRM-客户统计]按客户创建时间筛选,关联合同是否有成交记录,有则视为[成交客户] 2 years ago
YunaiV 05af77b786 crm:code review 客户画像 2 years ago
芋道源码 9ea43ce55a
!932 CRM: 完善用户画像数据统计
Merge pull request !932 from puhui999/develop
2 years ago
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
2 years ago