p38192567
/
ruoyi-vue-pro1
mirror of https://gitee.com/zhijiantianya/ruoyi-vue-pro.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
6,134 Commits 8 Branches 31 Tags 233 MiB
Commit Graph

6134 Commits

Author SHA1 Message Date
YunaiV 46d26659bf ✨ ERP：初始化其它入库的表单 50% 2024-02-06 15:58:29 +08:00
YunaiV db79926c31 ✨ ERP：完成 stock 产品库存、库存明细的实现 2024-02-05 19:24:33 +08:00
YunaiV 4f236c62ee ✨ 全局：修改 Vue3 + EP 版本的代码生成的注释相关 2024-02-05 19:04:44 +08:00
YunaiV b7654eafea ✨ ERP：完成 stock 仓库信息的实现 2024-02-05 01:36:34 +08:00
YunaiV a36ae0c469 ✨ ERP：完成 product 信息、分类、单位的实现 2024-02-05 00:15:51 +08:00
YunaiV e66ded2860 ✨ ERP：初始化 product 信息、分类、单位的实现 2024-02-04 19:57:47 +08:00
YunaiV bf8ec22144 📖 CRM：code review 合同的代码实现 2024-02-04 12:57:26 +08:00
YunaiV 3347d3320d 📖 CRM：code review 合同的代码实现 2024-02-04 09:41:50 +08:00
芋道源码 bb9173f7f0
!864 CRM-合同：完善 TODO 
Merge pull request !864 from puhui999/develop
 2024-02-04 01:13:25 +00:00
puhui999 ba6218b835 CRM-合同: transfer 2024-02-03 22:13:02 +08:00
puhui999 59dfa10461 Merge remote-tracking branch 'yudao/develop' into develop 
# Conflicts:
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/business/CrmBusinessServiceImpl.java
 2024-02-03 20:52:08 +08:00
puhui999 53badfc367 CRM-CONTRACT: 完善合同编辑回显 2024-02-03 20:49:13 +08:00
YunaiV 9fbbce4e8d 📖 BPMN：code review bpmn 中辅助查找代码 2024-02-03 16:12:27 +08:00
芋道源码 b5777b57f1
!863 添加assigne处理器 
Merge pull request !863 from 云开/feature/BPM_CC_COPY
 2024-02-03 08:09:11 +00:00
kyle 66615f9e14 chore: 整理代码 2024-02-03 15:41:57 +08:00
kyle b2370564a4 feat: 添加查找用户的处理器，用于在bpmn中辅助查找用户 2024-02-03 15:41:53 +08:00
puhui999 6a63f2f078 CRM-CONTRACT: 完善合同编辑回显 2024-02-03 14:08:06 +08:00
puhui999 59e6f23788 CRM-CONTRACT: 完善 TODO 2024-02-03 12:29:28 +08:00
YunaiV e9a29e6dd4 CRM：优化合同金额排行、回款金额排行 2024-02-03 01:14:35 +08:00
芋道源码 1fd731a90a
!861 修改：CRM 商业智能，合并模块到 crm，优化查询 
Merge pull request !861 from 安浩浩/develop
 2024-02-02 01:29:35 +00:00
puhui999 1a96fb2ffc Merge remote-tracking branch 'yudao/develop' into develop 
# Conflicts:
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contract/CrmContractServiceImpl.java
 2024-02-01 14:17:15 +08:00
YunaiV f5f827b59f 📖 CRM：code review 合同流程 2024-02-01 09:46:32 +08:00
puhui999 624b35988e BPM: 实现业务流程结果监听器 2024-02-01 00:45:29 +08:00
安浩浩 46e01e07a8 修改：CRM 商业智能，合并模块到 crm，优化查询 2024-01-31 23:35:27 +08:00
芋道源码 acb8d3f23b
!858 CRM-客户: 完善客户导入 
Merge pull request !858 from puhui999/develop
 2024-01-30 04:41:14 +00:00
YunaiV 6f95f37117 📖 CRM：code review 待进入公海的客户 2024-01-30 12:40:23 +08:00
芋道源码 cd28128e42
!859 feat: CRM-backlog-待进入公海的客户 
Merge pull request !859 from dhb52/crm-msg
 2024-01-30 04:14:32 +00:00
YunaiV 52a68e1838 📖 CRM：code review 合同金额排行榜、回款金额排行榜 2024-01-30 09:24:42 +08:00
芋道源码 278f220cef
!860 新增：CRM 商业智能，合同金额排行榜和回款金额排行榜 
Merge pull request !860 from 安浩浩/develop
 2024-01-30 00:34:50 +00:00
anhaohao bfed37af6f 修改：CRM 商业智能，回款金额排行榜时间字段 bug 2024-01-28 21:47:52 +08:00
puhui999 4418a7bebc CRM-合同：完善新增合同插入关联的商品 2024-01-28 20:15:11 +08:00
anhaohao fdd5d55fc8 Merge remote-tracking branch 'origin/develop' into develop 2024-01-28 20:11:00 +08:00
anhaohao 8d3ef13602 Merge remote-tracking branch 'origin/develop' into develop 2024-01-28 20:07:04 +08:00
anhaohao 65d7f8c4ab 新增：CRM 商业智能，合同金额排行榜和回款金额排行榜 2024-01-28 20:06:56 +08:00
anhaohao ab43e89a48 修改：CRM 商业智能，合同金额排行榜和回款金额排行榜 2024-01-28 20:00:51 +08:00
puhui999 ea6752f15e BPM: 新增通过流程标识获取流程图 2024-01-28 16:34:39 +08:00
puhui999 1cab3c009c CRM-合同：新增发起合同审批 2024-01-28 01:50:27 +08:00
dhb52 5d8ca19b17 feat: CRM-backlog-待进入公海的客户 2024-01-28 00:22:58 +08:00
YunaiV 6e005f46d9 ✨ ERP：【销售订单】初始化 2024-01-27 23:25:52 +08:00
YunaiV ebd9222764 ✨ ERP：初始化模块，立个 2024 年的 flag 2024-01-27 17:25:07 +08:00
YunaiV 722223c659 Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop 
# Conflicts:
#	yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/comment/ProductCommentServiceImplTest.java
 2024-01-27 16:44:58 +08:00
puhui999 a877bb4731 CRM-客户: 完善客户导入 2024-01-27 15:15:30 +08:00
puhui999 4605e93105 CRM-客户: 完善客户导入 2024-01-27 14:30:30 +08:00
puhui999 d8b2da8eed CRM-客户: 完善 TODO 2024-01-27 13:34:59 +08:00
YunaiV 35205edff9 ✨ 全局：将 sms 融合到 system 模块里，减少 starter 2024-01-27 13:09:25 +08:00
YunaiV 524ee8c467 ✨ 全局：将 sms 融合到 system 模块里，减少 starter 2024-01-27 13:06:15 +08:00
YunaiV 5acdd1554e ✨ 全局：将 sms 融合到 system 模块里，减少 starter 2024-01-27 11:25:43 +08:00
YunaiV 5b69df074c ✨ 全局：将 banner、error-code、desensitize 融合到 web 组件里，减少 starter 2024-01-27 10:25:25 +08:00
YunaiV d492daced4 📖 CRM：code review 跟进记录 2024-01-27 00:55:42 +08:00
芋道源码 6a6f669c7f
!854 CRM：【线索】 
Merge pull request !854 from Minh-X/develop
 2024-01-26 15:46:47 +00:00