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

6878 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
YunaiV
1ae535fc87 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2024-01-05 01:31:14 +08:00
YunaiV
3091a0882f Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2024-01-05 01:29:57 +08:00
YunaiV
ee250c74d6 ✨ MALL：更新 uni-app + Vue3 实现 2024-01-05 01:28:39 +08:00
puhui999
ea4b4b8956 CRM-客户：精简 VO 2024-01-05 00:15:26 +08:00
puhui999
e6f4c1f0d5 Merge remote-tracking branch 'yudao/develop' into develop 2024-01-04 09:59:50 +08:00
YunaiV
a974d055b6 📖 CRM：【还款】code review 还款的代码，补全对应的 todo list 2024-01-04 09:41:58 +08:00
YunaiV
c6a9751511 📖 CRM：【合同】code review 合同的代码，补全对应的 todo list 2024-01-04 09:18:44 +08:00
YunaiV
2668e0cfeb 📖 CRM：【产品】code review 产品的代码，补全对应的 todo list 2024-01-04 08:01:04 +08:00
YunaiV
b9f1e8ffaf 📖 CRM：【联系人】code review 商机的代码，补全对应的 todo list 2024-01-04 07:53:00 +08:00
杨宇庆
9e895c8af1
修复订单操作日志中快递公司名称模板与数据对不上的问题 
cn.iocoder.yudao.module.trade.enums.order.TradeOrderOperateTypeEnum中ADMIN_DELIVERY为deliveryName

Signed-off-by: 杨宇庆 <hiyyq@qq.com>
 2024-01-03 18:50:23 +00:00
YunaiV
02324f9e60 ✨ CRM：【联系人】统一字段 2024-01-03 23:30:25 +08:00
YunaiV
cff6e520ee 📖 CRM：【联系人】code review 联系人的代码，补全对应的 todo list 2024-01-03 22:07:20 +08:00
YunaiV
f8f5e525be ✨ CRM：新增跟进记录表 2024-01-03 20:56:28 +08:00
YunaiV
2e7c3e09a9 📖 CRM：code review 所有代码，补充对应 todo 2024-01-03 19:38:13 +08:00
YunaiV
d0df0e8e16 📖 CRM：【客户】优化锁定客户的逻辑实现 2024-01-03 13:06:49 +08:00
puhui999
e18ac461ea fix: 修复公众号模块，当粉丝第一次关注的时候会出现错误（公众号粉丝不存在） 2024-01-03 11:11:20 +08:00
puhui999
90bdc1fd83 fix: 修复公众号统计接口字符串日期转 localDateTime 报错的问题 2024-01-03 10:09:41 +08:00
YunaiV
0253846fdf Merge branch 'develop' of https://gitee.com/zh8790/ruoyi-vue-pro_develop into develop 
# Conflicts:
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerServiceImpl.java
 2024-01-02 22:21:14 +08:00
YunaiV
1da8006af3 📖 CRM：【客户】完善列表、新增、修改接口的 todo 2024-01-02 21:45:02 +08:00
YunaiV
9e3055ee1e 📖 CRM：code review 商机模块 2024-01-02 18:49:14 +08:00
yunlongn
39d26cc84d 会员当前有等级的时候下订单会把当前等级清空得bug修复 2024-01-02 15:33:13 +08:00
YunaiV
2d0537387b Merge branch 'develop' of https://gitee.com/zyna/ruoyi-vue-pro into develop 
# Conflicts:
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contact/CrmContactBusinessLinkServiceImpl.java
 2023-12-30 21:43:04 +08:00
YunaiV
8c9b483ac5 📖 code review 操作日志的实现 2023-12-30 21:36:46 +08:00
芋道源码
9c3cf1d6b6
!806 操作日志：完善 code review 提到的问题 
Merge pull request !806 from puhui999/develop
 2023-12-30 12:14:40 +00:00
YunaiV
290f45dd6e Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop 
# Conflicts:
#	yudao-server/src/main/resources/application-local.yaml
 2023-12-30 20:11:07 +08:00
YunaiV
6c0978407b Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	yudao-dependencies/pom.xml
 2023-12-30 19:23:35 +08:00
YunaiV
8a947990f4 🐛 升级 easyexcel 依赖，解决 JDK21 导出报错 2023-12-30 19:22:58 +08:00
YunaiV
5946bddff8 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	yudao-framework/yudao-spring-boot-starter-flowable/src/main/java/cn/iocoder/yudao/framework/flowable/config/YudaoFlowableConfiguration.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-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/jmreport/core/service/JmReportTokenServiceImpl.java
 2023-12-30 13:13:21 +08:00
YunaiV
a98d00a7fe Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2023-12-30 12:01:25 +08:00
YunaiV
2fb36563ec 🐛 修复 CacheUtils 异步缓存的 ThreadLocal 变量传递 2023-12-30 12:01:12 +08:00
YunaiV
81c726542b Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2023-12-30 11:24:15 +08:00
YunaiV
51968c4c19 🐛 腾讯云上传 bug 2023-12-30 11:23:59 +08:00
YunaiV
e35b8c45a0 🐛 REPORT：支持 SaaS 租户模式 2023-12-30 10:38:53 +08:00
YunaiV
baabebb5d1 Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	yudao-dependencies/pom.xml
#	yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/ureport/config/UReportConfiguration.java
#	yudao-server/src/main/resources/application-dev.yaml
#	yudao-server/src/main/resources/application-local.yaml
 2023-12-30 10:31:39 +08:00
YunaiV
078ead536b 🐛 REPORT：支持 SaaS 租户模式 2023-12-30 10:30:47 +08:00
YunaiV
be0e0f5d71 Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2023-12-30 09:38:13 +08:00
YunaiV
9a03f1a796 🐛 BPM：多租户的工作流隔离 2023-12-30 09:38:01 +08:00
YunaiV
cd7da1b3a2 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/service/task/BpmProcessInstanceServiceImpl.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/dal/mysql/order/PayOrderExtensionMapper.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/demo/PayDemoOrderServiceImpl.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/order/PayOrderServiceImpl.java
 2023-12-29 23:51:51 +08:00
YunaiV
2ede505987 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
 2023-12-29 22:35:26 +08:00
YunaiV
c48e0b9f48 Merge remote-tracking branch 'origin/master' 2023-12-29 22:34:50 +08:00
芋道源码
b5e19c63f7
!799 解决审批流自定义脚本无法获取流程变量 
Merge pull request !799 from xiuuuu/master-jdk21
 2023-12-29 14:34:06 +00:00
YunaiV
c38790655f Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2023-12-29 22:33:40 +08:00
YunaiV
d31a12aff7 🐛 修改了支付 demo 退款单匹配错误问题 2023-12-29 22:33:26 +08:00
芋道源码
8dc56cc3f5
!800 修改了支付demo退款单匹配错误问题 
Merge pull request !800 from lynfgn/master
 2023-12-29 14:30:54 +00:00
芋道源码
53a64272b9
!804 代码生成器Vue2，Excel导出下载修复 
Merge pull request !804 from virtuecai/master
 2023-12-29 14:27:21 +00:00
YunaiV
b0857aedbc 🐛 修复 ExcelUtils 报错 2023-12-29 22:23:07 +08:00
YunaiV
f0fd0c6677 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/FileController.java
 2023-12-29 22:21:45 +08:00
YunaiV
8de2eea1f7 Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2023-12-29 22:21:11 +08:00
YunaiV
ed1b55fed7 🐛 文件路径 url 中文解码问题 2023-12-29 22:20:59 +08:00
芋道源码
b1be080e2f
!807 文件路径url中文解码问题 
Merge pull request !807 from ccran/master
 2023-12-29 14:19:48 +00:00