lxd/FlowPacs
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,645 Commits 2 Branches 0 Tags 165 MiB
ab43f0ac2a
Commit Graph

6645 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
YunaiV
a80ba48889 bugfix：同步 master 修改的 bug 2024-03-28 19:05:16 +08:00
芋道源码
1cd5f47eb3
!926 【轻量级 PR】：fix: convertXxxByFlatMap, 当map后内容为null时, flatMap会出现NPE 
Merge pull request !926 from dhb52/N/A
 2024-03-28 11:01:43 +00:00
芋道源码
9b85a9617d
!915 添加加入购物车商品数量不可为0或更低数量的限制 
Merge pull request !915 from 风狗/N/A
 2024-03-28 10:58:24 +00:00
芋道源码
6c12e68a0a
!908 解决查看未上架的商品时，报错缺少商品名称问题 
Merge pull request !908 from 杨宇庆/N/A
 2024-03-28 10:55:59 +00:00
YunaiV
907f3a58ba Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop 
# Conflicts:
#	sql/mysql/ruoyi-vue-pro.sql
 2024-03-28 18:53:54 +08:00
芋道源码
830485911b
!924 取消订单同步取消分销问题 
Merge pull request !924 from wangxiaorui/N/A
 2024-03-28 10:53:06 +00:00
芋道源码
0bd4fbfe52
!920 发货日志物流公司名称不显示问题 
Merge pull request !920 from 山野羡民/master
 2024-03-28 10:51:28 +00:00
芋道源码
20f8470b55
!922 修复ERP采购订单菜单权限错误问题 
Merge pull request !922 from zengheng/erp-dev
 2024-03-28 10:48:25 +00:00
dhb52
2ea56b51eb
【轻量级 PR】：fix: convertXxxByFlatMap, 当map后内容为null时, flatMap会出现NPE 
Signed-off-by: dhb52 <dhb52@126.com>
 2024-03-27 14:30:28 +00:00
YunaiV
f623156829 README：增加功能图，方便理解 2024-03-27 21:11:12 +08:00
YunaiV
2275f97e36 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/framework/flowable/core/candidate/expression/BpmTaskAssignStartUserExpression.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOALeaveServiceImpl.java
 2024-03-27 21:08:26 +08:00
YunaiV
ba541fba83 README：增加功能图，方便理解 2024-03-27 21:06:06 +08:00