Commit Graph

6857 Commits

Author SHA1 Message Date
puhui999
72cebfca14 CombinationRecordApiImpl 重命名一下 recordService 改为 combinationRecordService 解决和 mzt-biz-log 组件的 bean 冲突 2023-12-12 16:23:48 +08:00
YunaiV
840b7a42ba Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2023-12-12 12:40:07 +08:00
YunaiV
1e5b0a1c0d Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2023-12-12 12:21:55 +08:00
YunaiV
a7189e7425 考虑到大家的接受度,master 还是保持 jdk8 版本(稳定),master-jdk21 使用 jdk21 版本(创新) 2023-12-12 12:21:38 +08:00
YunaiV
ff00748d11 Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2023-12-12 12:20:32 +08:00
YunaiV
d2c071bbb6 考虑到大家的接受度,master 还是保持 jdk8 版本(稳定),master-jdk21 使用 jdk21 版本(创新) 2023-12-12 12:17:50 +08:00
YunaiV
e71867683e 📖 MALL:调整接口文档的说明 2023-12-12 12:11:28 +08:00
puhui999
8fa8f2890b CRM: 线索、联系人、回款、回款计划新增数据权限转移 2023-12-11 17:36:09 +08:00
puhui999
c234f5b5f8 CRM: 完善数据权限 2023-12-11 16:48:21 +08:00
puhui999
63431082e5 member: 完善连续签到 review 提到的问题 2023-12-11 16:37:14 +08:00
puhui999
1ac68aca97 CRM-回款计划:添加数据权限 2023-12-11 15:56:12 +08:00
puhui999
e4d3175f06 CRM-数据权限:完善 review 提到的问题 2023-12-11 12:02:41 +08:00
风狗
a6a9f4e3a6
增加 东莞市下面的行政区信息
Signed-off-by: 风狗 <909275705@qq.com>
2023-12-11 02:47:22 +00:00
kyle
6a8baff080 fix: 修复vm文件中,import依赖路径的错误 2023-12-11 09:28:43 +08:00
owen
1316f92081 Merge remote-tracking branch 'origin/develop' into develop 2023-12-09 21:38:45 +08:00
Joey
9bac10c6f7 完善客户锁定/解锁接口,校验锁定上限 2023-12-09 17:25:47 +08:00
YunaiV
a8c14614ab 增加《迁移功能到精简版》的说明地址 2023-12-09 15:39:29 +08:00
YunaiV
5c60202c14 🐛 移除多余的 yudao-spring-boot-starter-security 依赖 2023-12-09 15:39:29 +08:00
YunaiV
23df8633f4 📖 CRM:code review 数据权限的实现 2023-12-09 10:50:47 +08:00
芋道源码
8f578a9a82
!789 完善数据权限,新增权限关联、场景分页查询,新增权限关联批量查询
Merge pull request !789 from puhui999/develop
2023-12-09 01:47:17 +00:00
YunaiV
517f3bc187 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk8 2023-12-09 01:10:09 +08:00
YunaiV
8c67d1d0ba 增加《迁移功能到精简版》的说明地址 2023-12-09 01:05:25 +08:00
puhui999
7c54affb16 CRM-合同:完善数据权限,新增权限关联、场景分页查询,新增权限关联批量查询 2023-12-08 22:43:45 +08:00
YunaiV
3806c8275f Merge remote-tracking branch 'origin/master-jdk8' into master-jdk8 2023-12-08 22:27:50 +08:00
YunaiV
fc9f46947e 🎉 精简仅保留 system、infra 功能,适合小项目 2023-12-08 22:27:38 +08:00
YunaiV
57b8411f03 Merge remote-tracking branch 'origin/master-jdk8' into master-jdk8 2023-12-08 22:19:01 +08:00
YunaiV
72865b5ebb ⬇️ 保持 JDK8 + Spring Boot 2.7.18 持续维护 2023-12-08 22:17:52 +08:00
YunaiV
802ac89b73 ⬇️ 保持 JDK8 + Spring Boot 2.7.18 持续维护 2023-12-08 22:17:52 +08:00
YunaiV
10d245afc3 🐛 移除多余的 yudao-spring-boot-starter-security 依赖 2023-12-08 22:17:13 +08:00
puhui999
f69a18fd23 CRM-联系人:完善数据权限,新增权限关联、场景分页查询,新增权限关联批量查询 2023-12-08 18:08:41 +08:00
puhui999
490418a1fc CRM-线索:完善数据权限,新增权限关联、场景分页查询,新增权限关联批量查询 2023-12-08 17:52:02 +08:00
puhui999
9ea0607339 CRM-商机:完善数据权限,新增权限关联、场景分页查询,新增权限关联批量查询 2023-12-08 17:16:34 +08:00
puhui999
5c395fc1c4 CRM: 完善 code review 数据权限提到的问题,重新封装 CrmQueryWrapperUtils 2023-12-08 15:27:58 +08:00
owen
f8604e17a1 营销:修正文章字段名、接口方法名 2023-12-08 10:20:16 +08:00
YunaiV
de9da10730 🎉 精简仅保留 system、infra 功能,适合小项目 2023-12-07 23:52:52 +08:00
YunaiV
8b80c9f415 Merge remote-tracking branch 'origin/master-jdk8' into master-jdk8 2023-12-07 23:23:03 +08:00
YunaiV
a0d72ffb00 ⬇️ 保持 JDK8 + Spring Boot 2.7.18 持续维护 2023-12-07 23:22:46 +08:00
YunaiV
7e806c65dc ⬇️ 保持 JDK8 + Spring Boot 2.7.18 持续维护 2023-12-07 23:21:23 +08:00
YunaiV
db62d70f3f ⬆️ JDK21 + Spring Boot 3.2.0 晋升 master 分支,开启 2.0.0 版本 2023-12-07 23:21:05 +08:00
YunaiV
9574b23d9a Merge remote-tracking branch 'origin/master-jdk8' into master-jdk8 2023-12-07 23:19:01 +08:00
YunaiV
8f2a156f30 ⬇️ 保持 JDK8 + Spring Boot 2.7.18 持续维护 2023-12-07 23:18:21 +08:00
YunaiV
0be3947199 ⬆️ JDK21 + Spring Boot 3.2.0 晋升 master 分支,开启 2.0.0 版本 2023-12-07 23:17:02 +08:00
YunaiV
a321805ff0 ⬇️ 保持 JDK8 + Spring Boot 2.7.18 持续维护 2023-12-07 23:16:45 +08:00
YunaiV
59ff4be03d ⬇️ 保持 JDK8 + Spring Boot 2.7.18 持续维护 2023-12-07 23:11:20 +08:00
YunaiV
3cd27c83d2 ⬆️ JDK21 + Spring Boot 3.2.0 晋升 master 分支,开启 2.0.0 版本 2023-12-07 20:58:32 +08:00
YunaiV
98697ee075 ⬆️ 2023-12-07 20:48:11 +08:00
芋道源码
a8e8c14ab3
!787 合并最新商城代码
Merge pull request !787 from 芋道源码/feature/mall_product
2023-12-07 11:48:54 +00:00
YunaiV
2ad27a487f Merge remote-tracking branch 'origin/master' 2023-12-07 07:37:39 +08:00
YunaiV
a9ae7b0865 完善 UReport2 的集成 2023-12-07 07:37:32 +08:00
YunaiV
30bf72f50e 🚚 将运维相关的统一到 script 目录下,简化根目录 2023-12-07 07:36:33 +08:00