dhb52
|
1121c21c8b
|
fix: [CRM-客户统计]按客户创建时间筛选,关联合同是否有成交记录,有则视为[成交客户]
|
2024-04-06 14:44:03 +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 |
|
cherishsince
|
1b02733c10
|
增加图片生成 socket 接收到的消息类型、消息过程
|
2024-04-05 10:23:35 +08:00 |
|
cherishsince
|
dfbd75b53c
|
修改test，增加before初始化
|
2024-04-05 10:16:46 +08:00 |
|
cherishsince
|
44e44dc4bb
|
增加注释
|
2024-04-05 10:15:59 +08:00 |
|
cherishsince
|
5044a58118
|
增加mj web socket
|
2024-04-05 09:27:09 +08:00 |
|
cherishsince
|
28b2fad7b6
|
增加mj web socket 测试类
|
2024-04-05 08:46:41 +08:00 |
|
cherishsince
|
6adb8d657c
|
处理异常结果，日志输出
|
2024-04-04 19:43:28 +08:00 |
|
cherishsince
|
e6bc5cf069
|
删除没用的 import
|
2024-04-04 19:40:21 +08:00 |
|
cherishsince
|
b77e8f16e9
|
增加 mj Imagine 测试类
|
2024-04-04 19:38:03 +08:00 |
|
cherishsince
|
f1f003b76d
|
imagine 发送模板
|
2024-04-04 19:34:41 +08:00 |
|
cherishsince
|
98b4fb7ff0
|
增加 imagine 命令发送
|
2024-04-04 19:33:55 +08:00 |
|
YunaiV
|
a36800ba8a
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk21
# Conflicts:
# yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/permission/RoleServiceImplTest.java
|
2024-04-04 10:03:24 +08:00 |
|
YunaiV
|
f869a5718d
|
【新增】system user 和 role 接入新操作日志
|
2024-04-04 09:57:06 +08:00 |
|
YunaiV
|
87c7b3fac2
|
【新增】system user 和 role 接入新操作日志
|
2024-04-04 09:42:03 +08:00 |
|
YunaiV
|
98f1272c0c
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk21
# 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-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:21:33 +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
|
22a170ee62
|
【优化】增强访问日志，支持是否记录、脱敏、操作信息等功能
|
2024-04-03 19:55:14 +08:00 |
|
YunaiV
|
132c1cc828
|
【优化】增强访问日志，支持是否记录、脱敏、操作信息等功能
|
2024-04-03 19:52:52 +08:00 |
|
cherishsince
|
2f6b9b2ef5
|
移动文件目录
|
2024-04-03 17:09:22 +08:00 |
|
cherishsince
|
84825579b6
|
😄模拟发送、接收discard消息成功！
|
2024-04-03 16:54:49 +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 |
|
dhb52
|
1944199f67
|
fix: 按Code-Review修改CrmStatisticsCustomerMapper.xml
|
2024-04-02 23:44:17 +08:00 |
|
jason
|
d88718071d
|
仿钉钉流程设计-排他网关实现
|
2024-04-02 20:50:49 +08:00 |
|
YunaiV
|
050f0c9a22
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk21
# Conflicts:
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/task/BpmProcessInstanceConvert.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/util/FlowableUtils.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmModelServiceImpl.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmProcessDefinitionServiceImpl.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmTaskServiceImpl.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/product/CrmProductController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/product/vo/product/CrmProductRespVO.java
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelServiceImpl.java
# yudao-module-mp/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/controller/admin/user/vo/MpUserPageReqVO.java
# yudao-module-mp/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/controller/admin/user/vo/MpUserRespVO.java
# yudao-module-mp/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/convert/user/MpUserConvert.java
# yudao-module-mp/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/dal/dataobject/user/MpUserDO.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/app/PayAppController.java
# yudao-module-report/yudao-module-report-api/src/main/java/cn/iocoder/yudao/module/report/enums/ErrorCodeConstants.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/framework/security/config/SecurityConfiguration.java
# yudao-module-report/yudao-module-report-biz/src/test/resources/sql/clean.sql
# yudao-module-report/yudao-module-report-biz/src/test/resources/sql/create_tables.sql
|
2024-04-02 20:36:58 +08:00 |
|
芋道源码
|
9fac998a14
|
!930 全局：增加 VO 数据翻译的支持
Merge pull request !930 from 芋道源码/feature/easy-trans
|
2024-04-02 12:05:01 +00:00 |
|
cherishsince
|
bd8e6c2b40
|
增加mj 执行器(先提交一下)
|
2024-04-02 00:44:04 +08:00 |
|
cherishsince
|
e91e7355dc
|
发送消息 type2 和 type3
|
2024-04-02 00:43:38 +08:00 |
|
cherishsince
|
5d4a111170
|
mj执行器
|
2024-04-01 22:32:07 +08:00 |
|
cherishsince
|
196b9ab39c
|
增加 interactions 核心接口数据
|
2024-04-01 22:14:38 +08:00 |
|
cherishsince
|
7543875e32
|
mj 命令
|
2024-04-01 22:13:01 +08:00 |
|
cherishsince
|
e7e5b729a6
|
mj 命令类型
|
2024-04-01 22:12:23 +08:00 |
|
cherishsince
|
9cd97a77e0
|
Merge remote-tracking branch 'origin/master-jdk21-ai' into master-jdk21-ai
|
2024-04-01 21:26:07 +08:00 |
|
cherishsince
|
73631fb364
|
增加注释
|
2024-04-01 21:25:35 +08:00 |
|
YunaiV
|
beea186507
|
全局：增加 VO 数据翻译的支持
|
2024-04-01 12:42:27 +08:00 |
|
YunaiV
|
1b708ccd55
|
BPM：code review 快搭的实现
|
2024-03-30 22:13:26 +08:00 |
|
YunaiV
|
dcf6cc293e
|
BPM：【移除】Ureport 的实现，因为和 Spring Boot 兼容性较差
|
2024-03-30 20:44:45 +08:00 |
|
YunaiV
|
c9b3cf9ed4
|
MP：增加 unionid
|
2024-03-30 19:57:46 +08:00 |
|
YunaiV
|
0b91603652
|
Member：会员等级变更修复
|
2024-03-30 19:48:41 +08:00 |
|
YunaiV
|
81bcf718cd
|
BPM：解决租户关闭时，Flowable 查询会报错的问题
|
2024-03-30 18:02:25 +08:00 |
|