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 |
|
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
|
1b6f998b3f
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# 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-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseOrderController.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/AppProductSpuController.java
# yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/order/TradeOrderOperateTypeEnum.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/vo/AppCartAddReqVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/handler/TradeBrokerageOrderHandler.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-pay/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/weixin/AbstractWxPayClient.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:38:45 +08:00 |
|
YunaiV
|
cfe9c327c5
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2024-04-02 20:35:09 +08:00 |
|
芋道源码
|
9fac998a14
|
!930 全局：增加 VO 数据翻译的支持
Merge pull request !930 from 芋道源码/feature/easy-trans
|
2024-04-02 12:05:01 +00:00 |
|
YunaiV
|
594eb0ccc2
|
全局：增加 VO 数据翻译的支持
|
2024-04-01 21:46:57 +08:00 |
|
YunaiV
|
b4e602bbd4
|
全局：增加 VO 数据翻译的支持
|
2024-04-01 12:51:45 +08:00 |
|
YunaiV
|
398e2a225a
|
Merge branch 'feature/easy-trans' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-dependencies/pom.xml
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/logger/OperateLogApiImpl.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/OperateLogController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/vo/operatelog/OperateLogRespVO.java
|
2024-04-01 12:44:59 +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
|
c0b1bb0d3f
|
BPM：【移除】Ureport 的实现，因为和 Spring Boot 兼容性较差
|
2024-03-30 20:49:11 +08:00 |
|
YunaiV
|
dc466d2286
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/controller/admin/ureport/UReportDataController.java
# yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/controller/admin/ureport/vo/UReportDataSaveReqVO.java
# 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/main/java/cn/iocoder/yudao/module/report/framework/ureport/config/UReportConfiguration.java
# yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/ureport/core/UReportDataSource.java
# yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/ureport/core/UReportDatabaseProvider.java
# yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/ureport/core/UReportFilter.java
# yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/service/ureport/UReportDataService.java
# yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/service/ureport/UReportDataServiceImpl.java
# yudao-module-report/yudao-module-report-biz/src/test/java/cn/iocoder/yudao/module/report/service/ureport/UReportDataServiceImplTest.java
|
2024-03-30 20:45:11 +08:00 |
|
YunaiV
|
dcf6cc293e
|
BPM：【移除】Ureport 的实现，因为和 Spring Boot 兼容性较差
|
2024-03-30 20:44:45 +08:00 |
|
YunaiV
|
fd42257ed0
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2024-03-30 20:02:33 +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
|
a0c065fe73
|
Merge remote-tracking branch 'origin/master'
|
2024-03-30 18:05:45 +08:00 |
|
YunaiV
|
423fc9227c
|
bugfix：修复 Xss 开启时，忽略的 URL 针对 RequestBody 还是会 XSS 过滤的问题
|
2024-03-30 18:05:39 +08:00 |
|
YunaiV
|
6b79058417
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
|
2024-03-30 18:03:14 +08:00 |
|
YunaiV
|
81bcf718cd
|
BPM：解决租户关闭时，Flowable 查询会报错的问题
|
2024-03-30 18:02:25 +08:00 |
|
YunaiV
|
0917b621e6
|
BPM：解决租户关闭时，Flowable 查询会报错的问题
|
2024-03-30 18:02:12 +08:00 |
|
芋道源码
|
a09b46217b
|
!912 解决退款失败时返回退款订单号错误的问题
Merge pull request !912 from 杨宇庆/N/A
|
2024-03-30 09:45:37 +00:00 |
|
YunaiV
|
f265762f22
|
修复 jdk8版本下docker-compose中Redis Host参数名称不正确的问题
|
2024-03-30 17:44:24 +08:00 |
|
YunaiV
|
3b7a1b55b9
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2024-03-30 17:43:31 +08:00 |
|
芋道源码
|
59a63911fb
|
!901 修复 jdk21版本下docker-compose中Redis Host参数名称不正确的问题
Merge pull request !901 from E1/master-jdk21
|
2024-03-30 09:43:05 +00:00 |
|
YunaiV
|
c943233ee5
|
bugfix：修复 Xss 开启时，忽略的 URL 针对 RequestBody 还是会 XSS 过滤的问题
|
2024-03-30 17:39:56 +08:00 |
|
YunaiV
|
e48240a192
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2024-03-30 17:09:26 +08:00 |
|
YunaiV
|
6cf7e60893
|
Merge branch 'master' of https://github.com/YunaiV/ruoyi-vue-pro
|
2024-03-30 17:09:14 +08:00 |
|
芋道源码
|
c3184d70ac
|
Merge pull request #462 from cheng102e/fix/issue-401
fix: [issue-401]修复中山市
|
2024-03-30 17:07:51 +08:00 |
|
YunaiV
|
d636391a50
|
bugfix：修复中山市缺少
|
2024-03-30 17:07:36 +08:00 |
|
YunaiV
|
a68abc43ae
|
CRM：修复 @RequestBody 和 Multipart 不能同时存在的异常和导入客户后序列化产生的异常
|
2024-03-30 17:06:13 +08:00 |
|
YunaiV
|
ba50e62af9
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/app/PayAppController.java
|
2024-03-30 17:00:16 +08:00 |
|
YunaiV
|
c78519c6aa
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/app/PayAppController.java
|
2024-03-30 16:59:46 +08:00 |
|
YunaiV
|
544d9030e6
|
pay：后台支付应用信息列表关闭某一渠道，但是任然显示为开启状态
|
2024-03-30 16:59:05 +08:00 |
|
YunaiV
|
5faa006dd0
|
bugfix：修复拼团详情错误传递 groupon_id 的问题
|
2024-03-30 15:28:46 +08:00 |
|
YunaiV
|
f591a04317
|
CRM：code review【员工业绩】的实现
|
2024-03-30 14:39:34 +08:00 |
|
芋道源码
|
08c851aeab
|
!916 CRM员工业绩统计PR v1.0
Merge pull request !916 from scholarli/develop
|
2024-03-30 06:25:28 +00:00 |
|
YunaiV
|
3f5724e978
|
CRM：code review【客户画像】的实现
|
2024-03-30 14:17:28 +08:00 |
|
YunaiV
|
924580f4a2
|
CRM：重构【客户画像】，从【客户统计】拆分出去先~
|
2024-03-30 13:51:46 +08:00 |
|
YunaiV
|
3b379d8cc0
|
Merge branch 'develop' of https://gitee.com/puhui999/ruoyi-vue-pro into develop
# Conflicts:
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/statistics/CrmStatisticsCustomerController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/statistics/CrmStatisticsCustomerServiceImpl.java
|
2024-03-30 11:54:27 +08:00 |
|
YunaiV
|
8266fb8f94
|
CRM：完善【排行版】功能
|
2024-03-30 11:49:06 +08:00 |
|
YunaiV
|
a8bec19196
|
CRM：code review【客户统计】的代码实现
|
2024-03-30 11:00:15 +08:00 |
|
YunaiV
|
90f82b157d
|
CRM：优化【客户统计】的代码实现
|
2024-03-30 09:22:54 +08:00 |
|
jason
|
b504d9841e
|
仿钉钉流程设计-后端实现30%
|
2024-03-29 19:49:47 +08:00 |
|
jiejc1
|
7d26d63dba
|
fix: [issue-401]修复中山市
|
2024-03-28 20:06:31 +08:00 |
|
芋道源码
|
eab9627253
|
!909 feat: [CRM-客户分析]增加[时间间隔]选项
Merge pull request !909 from dhb52/develop
|
2024-03-28 11:13:18 +00:00 |
|
YunaiV
|
94b724e30a
|
Merge remote-tracking branch 'origin/develop' into develop
|
2024-03-28 19:05:24 +08:00 |
|