Commit Graph

6190 Commits

Author SHA1 Message Date
YunaiV
023a7b14d8 统一 JDK8 和 JDK21 相关代码 2024-01-19 12:38:57 +08:00
YunaiV
f4a55d3e26 🙂 同步 develop 最新开发代码 2024-01-19 09:10:26 +08:00
YunaiV
ba3fe15ec5 Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk21 2024-01-19 09:08:42 +08:00
YunaiV
fea84deca0 Pay:code review 支付转账的部分逻辑 2024-01-18 23:58:44 +08:00
YunaiV
ee1870802f BPM:抄送任务的 code review 2024-01-18 19:07:01 +08:00
芋道源码
a5dc4e7876
!839 流程增加抄送功能
Merge pull request !839 from 云开/feature/BPM_CC_develop
2024-01-18 04:18:43 +00:00
YunaiV
0abc618a1b Merge remote-tracking branch 'origin/develop' into develop 2024-01-18 12:17:17 +08:00
YunaiV
6624a93a84 CRM:跟进记录 code review 2024-01-18 12:17:12 +08:00
芋道源码
3cc127496e
!842 update sql/mysql/ruoyi-vue-pro.sql.
Merge pull request !842 from jay浅蓝/N/A
2024-01-18 04:08:27 +00:00
YunaiV
ca55282516 CRM:商机 code review 2024-01-18 12:06:14 +08:00
jay浅蓝
867d8bc3cd
update sql/mysql/ruoyi-vue-pro.sql.
数据库缺少trade:order:query 和 trade:order:update权限,会导致订单的发货和更多按钮无法显示。


Signed-off-by: jay浅蓝 <565215951@qq.com>
2024-01-18 03:43:47 +00:00
YunaiV
4c200eda92 MALL:清理多余的 MemberStatisticsDO 类 2024-01-18 00:00:42 +08:00
YunaiV
75f2b207a4 Merge remote-tracking branch 'origin/develop' into develop 2024-01-17 19:46:03 +08:00
YunaiV
dd0a2b73e8 MALL:清理多余的 decorate 类 2024-01-17 19:45:57 +08:00
芋道源码
adfbb1433c
!840 CRM: 完善跟进,新增跟进信息处理器 handler 接口✔
Merge pull request !840 from puhui999/develop
2024-01-17 04:26:03 +00:00
puhui999
7b36eb888e CRM-合同:RespVO 添加导出注解 2024-01-17 12:11:39 +08:00
puhui999
ff9cef6a92 CRM: 完善跟进,新增跟进信息处理器 handler 接口✔ 2024-01-17 12:00:51 +08:00
kyle
3720a648d7 refactor: 添加相关缺少字段 2024-01-17 09:29:14 +08:00
YunaiV
6dbc942cdd MALL:修复售后确认退款时,缺少退款描述信息 2024-01-16 22:41:37 +08:00
kyle
fc2a8f1311 fix: 修正测试依赖路径 2024-01-16 11:50:12 +08:00
kyle
9df6cc76e7 feat: 修正依赖路径 2024-01-16 11:22:24 +08:00
kyle
8f171ba3d0 feat: 添加抄送人相关功能以及接口 2024-01-16 11:13:36 +08:00
kyle
1bc472b528 feat: 添加创建人以及创建事件 2024-01-16 11:13:33 +08:00
kyle
555bac151d feat: 基本完成流程抄送 2024-01-16 11:13:31 +08:00
kyle
e21c262bd7 refactor: 重构查找候选人的逻辑 2024-01-16 11:13:26 +08:00
kyle
5ae1d0ab3e fix: 修复3处问题
1. AreaConvert缺少两个方法导致编译报缺少转换函数
2. 修复SocialUserBindReqVO.java在因为lombok和mapstruct的问题,导致报未知属性的问题
3. 修复Bpm报缺少AsyncTaskExecutor的问题
2024-01-16 11:09:02 +08:00
dhb52
5105c6d16f wip: LocalDate.now().atTime 2024-01-16 11:06:01 +08:00
dhb52
08e23a7dc4 wip: style-fix 2024-01-15 22:47:46 +08:00
YunaiV
9819e05d4e Merge branch 'develop' of https://gitee.com/aberizofur/ruoyi-vue-pro into develop 2024-01-15 21:34:47 +08:00
YunaiV
a886ad9785 📖 CRM:跟进记录的 code review 2024-01-15 21:30:32 +08:00
lzxhqs
510b4fd3de 商机模块合并代码 2024-01-15 17:50:46 +08:00
dhb52
4bd97c4baf wip: 根据code review优化代码 2024-01-15 17:41:21 +08:00
YunaiV
410c551e03 📖 CRM:跟进记录的 code review 2024-01-15 13:43:15 +08:00
芋道源码
e64e60c711
!832 CRM: 完善一些 TODO
Merge pull request !832 from puhui999/develop
2024-01-15 04:37:24 +00:00
芋道源码
cc6cb83507
!833 修改:CRM 产品,产品列表查询接入数据权限
Merge pull request !833 from 安浩浩/develop
2024-01-15 04:33:16 +00:00
YunaiV
9b7f6cfbac 📖 CRM:线索的 code review 2024-01-15 12:29:57 +08:00
芋道源码
4ca1f72d4f
!829 CRM:【线索】
Merge pull request !829 from Minh-X/develop
2024-01-15 04:22:23 +00:00
YunaiV
64e1d68923 📖 CRM:待办事项的 code review 2024-01-15 12:15:52 +08:00
anhaohao
454e800067 修改:CRM 产品,产品列表查询接入数据权限 2024-01-15 10:51:23 +08:00
芋道源码
e16f1caae0
!831 WIP: CRM-待办事项
Merge pull request !831 from dhb52/crm-msg
2024-01-15 00:53:04 +00:00
puhui999
0c30f59e02 Merge remote-tracking branch 'yudao/develop' into develop 2024-01-14 22:49:51 +08:00
puhui999
5efa0f327f crm: 完善一些 TODO 2024-01-14 22:49:01 +08:00
dhb52
4558ecd836 wip: 待办事项 2024-01-14 22:45:16 +08:00
lzxhqs
b249c4e852 Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop 2024-01-14 15:16:39 +08:00
YunaiV
50f7be9976 MALL:简化商评论的 VO 转化,去除无用的接口 2024-01-14 13:21:13 +08:00
lzxhqs
f361d05940 商机模块 2024-01-14 09:52:35 +08:00
puhui999
73c459f360 完善更进 2024-01-14 00:22:17 +08:00
min
2de0fb48ea CRM:【线索】 线索如果不存在或者已经转化,抛出异常 2024-01-13 23:27:21 +08:00
min
fe0bde8417 CRM:【线索】 CrmClueExcelVO 融合到 CrmClueRespVO 里 2024-01-13 23:27:21 +08:00
YunaiV
ed34b18d82 MALL:简化商品分类的 VO 转化 2024-01-13 22:58:24 +08:00