259 Commits (38cf944ba5119af710a05ae365dfeebde2a591e4)

Author SHA1 Message Date
YunaiV 7f0485e872 【修复】解决视频地址在移动端播放的兼容性问题 2 years ago
YunaiV fd832e23fd bugfix:非 json 请求(文件上传)时,token 过期时,错误读取 request body 问题 2 years ago
YunaiV 075157417c 清理代码:无用的 test-integration 目录,暂时不考虑集成测试 2 years ago
YunaiV 8093ef3b96 【移除】错误码的管理,简化项目的复杂度 2 years ago
YunaiV 5d58037d05 优化:将 hutool-all 6.0 版本替换成 hutool-extra,减少依赖 2 years ago
YunaiV c4ce9068f9 crm:code review 公海客户分析 2 years ago
dhb52 84140c52b0 fix: LocalDateTimeUtils.getDateRangeList计算季度区间有误 2 years ago
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
2 years ago
YunaiV 132c1cc828 【优化】增强访问日志,支持是否记录、脱敏、操作信息等功能 2 years ago
YunaiV beea186507 全局:增加 VO 数据翻译的支持 2 years ago
YunaiV 90f82b157d CRM:优化【客户统计】的代码实现 2 years ago
芋道源码 eab9627253
!909 feat: [CRM-客户分析]增加[时间间隔]选项
Merge pull request !909 from dhb52/develop
2 years ago
YunaiV 94b724e30a Merge remote-tracking branch 'origin/develop' into develop 2 years ago
YunaiV 907f3a58ba Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop
# Conflicts:
#	sql/mysql/ruoyi-vue-pro.sql
2 years ago
dhb52 2ea56b51eb
【轻量级 PR】:fix: convertXxxByFlatMap, 当map后内容为null时, flatMap会出现NPE
Signed-off-by: dhb52 <dhb52@126.com>
2 years ago
YunaiV f5f73adcbb BPM:重构流程分配人的实现,通过 BpmTaskCandidateStrategy 策略模式 2 years ago
YunaiV cdbcd4d673 BPM:重构审批人的分配规则实现,移除 bpm_task_assign_rule 表,存储在 bpmn 的 userTask 中 2 years ago
dhb52 4ac28603b8 feat: [CRM-客户分析]增加[时间间隔]选项 2 years ago
YunaiV d556b29214 CRM:code review 权限的优化 2 years ago
YunaiV 89fc83c419 CRM:code review 客户权限的实现 2 years ago
YunaiV d30700d060 【修复】微信支付时,无法保证父线程的 ThreadLocal 传入子线程 2 years ago
YunaiV 77d634038c 全局:简化 file 组件,融合到 infra 模块 2 years ago
YunaiV e53a0ca884 CRM:code review 客户导入 2 years ago
YunaiV 9ea7bde751 📖 ERP:增加 ERP 首页的统计 2 years ago
YunaiV 9e3858aea7 ERP:完成 payment 付款单的逻辑 100% 2 years ago
YunaiV dbc367ad95 ERP:基本完成销售入库模块 2 years ago
YunaiV 0694bc8684 ERP:完善 ERP 销售出库单的保存 2 years ago
YunaiV 3479ef8123 ERP:增加金额计算的四舍五入 2 years ago
YunaiV 593e1fd59c ERP:增加入库单的审批功能 2 years ago
puhui999 59e6f23788 CRM-CONTRACT: 完善 TODO 2 years ago
YunaiV 023a7b14d8 统一 JDK8 和 JDK21 相关代码 2 years ago
YunaiV e79c750b46 📖 CRM:code review 跟进记录的实现 2 years ago
YunaiV d80406acbb Merge branch 'develop' of https://gitee.com/puhui999/ruoyi-vue-pro into develop
# Conflicts:
#	yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/category/ProductCategoryServiceImplTest.java
2 years ago
YunaiV f6c8159dac MALL:简化 SPU 的 VO 转化 2 years ago
puhui999 9bba1ce8a4 新增 ParseFunctionNameConstants 常量枚举 2 years ago
YunaiV 2d1e57554d 📖 CRM:code review CRM 客户逻辑 2 years ago
芋道源码 3c7f63c356
!810 fix:修复 issues 提到的一些公众号上的问题
Merge pull request !810 from puhui999/develop
2 years ago
YunaiV bbba83ef61 📖 MALL:code review 商品统计的代码 2 years ago
YunaiV eb048532f7 Merge branch 'develop' of https://gitee.com/CrazyWorld/ruoyi-vue-pro into develop
# Conflicts:
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/article/AppArticleController.java
2 years ago
puhui999 68f5edaa88 CRM-客户: 完善一些 TODO 2 years ago
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
2 years ago
YunaiV 2fb36563ec 🐛 修复 CacheUtils 异步缓存的 ThreadLocal 变量传递 2 years ago
YunaiV d65c28d7f7 Member:社交登录逻辑调整,如果登录时无用户,则自动创建用户,保持和各 App 统一逻辑 2 years ago
owen 5851bcb479 Merge remote-tracking branch 'origin/develop' into develop 2 years ago
owen 4a007f0c98 统计:增加商品统计 2 years ago
puhui999 63431082e5 member: 完善连续签到 review 提到的问题 2 years ago
YunaiV 98697ee075 ⬆️ 2 years ago
YunaiV 899e40deb9 crm:code review 数据权限的实现 2 years ago
puhui999 77d7bcc73f crm-数据权限:完善数据权限 code review 提到的问题 2 years ago
YunaiV 90f135ad95 Merge branch 'feature/crm' of https://gitee.com/jiangwanwan/ruoyi-vue-pro into feature/crm
# Conflicts:
#	sql/mysql/crm.sql
2 years ago