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 |
|
YunaiV
|
0d8cac44b4
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/permission/RoleServiceImplTest.java
|
2024-04-04 10:04:32 +08:00 |
|
YunaiV
|
9ade9686f3
|
【新增】system user 和 role 接入新操作日志
|
2024-04-04 09:59:33 +08:00 |
|
YunaiV
|
a1fb3cf6ed
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2024-04-04 09:59:01 +08:00 |
|
YunaiV
|
f869a5718d
|
【新增】system user 和 role 接入新操作日志
|
2024-04-04 09:57:06 +08:00 |
|
YunaiV
|
1aa8e173b1
|
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/controller/admin/permission/vo/role/RoleUpdateStatusReqVO.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserSaveReqVO.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java
|
2024-04-04 09:49:14 +08:00 |
|
YunaiV
|
87c7b3fac2
|
【新增】system user 和 role 接入新操作日志
|
2024-04-04 09:42:03 +08:00 |
|
YunaiV
|
c945f4335d
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-bpm/yudao-module-bpm-biz/pom.xml
# yudao-module-crm/yudao-module-crm-biz/pom.xml
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/CrmBusinessController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/clue/CrmClueController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contact/CrmContactController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/CrmContractController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/CrmCustomerController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/operatelog/CrmOperateLogController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/product/CrmProductController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/receivable/CrmReceivableController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/receivable/CrmReceivablePlanController.java
# yudao-module-erp/yudao-module-erp-biz/pom.xml
# yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/finance/ErpAccountController.java
# yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/finance/ErpFinancePaymentController.java
# yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/finance/ErpFinanceReceiptController.java
# yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/ErpProductCategoryController.java
# yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/ErpProductController.java
# yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/ErpProductUnitController.java
# yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseInController.java
# yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseOrderController.java
# yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseReturnController.java
# yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpSupplierController.java
# yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/ErpCustomerController.java
# yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/ErpSaleOrderController.java
# yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/ErpSaleOutController.java
# yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/ErpSaleReturnController.java
# yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/ErpStockCheckController.java
# yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/ErpStockController.java
# yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/ErpStockInController.java
# yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/ErpStockMoveController.java
# yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/ErpStockOutController.java
# yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/ErpStockRecordController.java
# yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/ErpWarehouseController.java
# yudao-module-infra/yudao-module-infra-biz/src/test/resources/sql/create_tables.sql
# yudao-module-mall/yudao-module-product-biz/pom.xml
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/ProductSpuController.java
# yudao-module-mall/yudao-module-promotion-biz/pom.xml
# yudao-module-mall/yudao-module-statistics-biz/pom.xml
# yudao-module-mall/yudao-module-trade-biz/pom.xml
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/aftersale/AfterSaleController.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/DeliveryExpressController.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/vo/AppCartAddReqVO.java
# yudao-module-member/yudao-module-member-biz/pom.xml
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/auth/AppAuthController.java
# yudao-module-mp/yudao-module-mp-biz/pom.xml
# yudao-module-mp/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/controller/admin/open/MpOpenController.java
# yudao-module-pay/yudao-module-pay-biz/pom.xml
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/demo/PayDemoOrderController.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/demo/PayDemoTransferController.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/notify/PayNotifyController.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/order/PayOrderController.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/refund/PayRefundController.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/wallet/PayWalletRechargeController.java
# yudao-module-report/yudao-module-report-biz/pom.xml
# yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/controller/admin/goview/GoViewDataController.java
# yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/logger/OperateLogServiceImplTest.java
# yudao-module-system/yudao-module-system-biz/src/test/resources/sql/create_tables.sql
|
2024-04-04 02:24:42 +08:00 |
|
YunaiV
|
83623a024f
|
【重构】V2 操作日志转正，基于注解的可使用变量、可以自定义函数的通用操作日志组件
|
2024-04-04 02:21:03 +08:00 |
|
YunaiV
|
01cfa60a64
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-framework/yudao-spring-boot-starter-biz-operatelog/src/main/java/cn/iocoder/yudao/framework/operatelog/core/aop/OperateLogAspect.java
# yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseOrderController.java
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/demo01/Demo01ContactController.java
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/demo02/Demo02CategoryController.java
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/demo03/Demo03StudentController.java
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/job/JobController.java
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/job/JobLogController.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/DeliveryExpressController.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/order/PayOrderController.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/refund/PayRefundController.java
# yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/logger/OperateLogApi.java
# yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/logger/dto/OperateLogCreateReqDTO.java
# yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/logger/dto/OperateLogV2CreateReqDTO.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/PostController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/DictDataController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/DictTypeController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/errorcode/ErrorCodeController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/LoginLogController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/RoleController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sensitiveword/SensitiveWordController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/SmsLogController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/TenantController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/logger/OperateLogServiceImpl.java
# yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/logger/OperateLogServiceImplTest.java
|
2024-04-04 02:14:02 +08:00 |
|
YunaiV
|
20583417a4
|
【重构】V2 操作日志转正，基于注解的可使用变量、可以自定义函数的通用操作日志组件
|
2024-04-04 01:49:49 +08:00 |
|
YunaiV
|
000b6cf47f
|
【重构】V2 操作日志转正，基于注解的可使用变量、可以自定义函数的通用操作日志组件
|
2024-04-04 01:21:08 +08:00 |
|
YunaiV
|
1761495bce
|
【优化】增强访问日志，支持是否记录、脱敏、操作信息等功能
|
2024-04-03 20:02:05 +08:00 |
|
YunaiV
|
790f3dc99b
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/apilog/config/YudaoApiLogAutoConfiguration.java
# yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/apilog/core/filter/ApiAccessLogFilter.java
# yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/apilog/core/service/ApiAccessLog.java
# yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/apilog/core/service/ApiErrorLog.java
|
2024-04-03 19:56:19 +08:00 |
|
YunaiV
|
22a170ee62
|
【优化】增强访问日志，支持是否记录、脱敏、操作信息等功能
|
2024-04-03 19:55:14 +08:00 |
|
YunaiV
|
132c1cc828
|
【优化】增强访问日志，支持是否记录、脱敏、操作信息等功能
|
2024-04-03 19:52:52 +08:00 |
|
puhui999
|
eeed1fdf66
|
Merge remote-tracking branch 'yudao/develop' into develop
|
2024-04-03 11:04:42 +08:00 |
|
puhui999
|
a9a8efc808
|
CRM: 完善用户画像数据统计
|
2024-04-03 10:09:46 +08:00 |
|