463 Commits (02466aca2e0a9a37b3bdc09deeeea4f69251a641)

Author SHA1 Message Date
YunaiV a390fb4519 CRM:更新最新代码,支持线索、客户、联系人、商机、合同等功能 2 years ago
YunaiV 20f8cb1606 2.0.1 版本发布准备 2 years ago
YunaiV 0dff03b8b1 🔥 2.0.0 版本发布准备~ 2 years ago
YunaiV fea84deca0 Pay:code review 支付转账的部分逻辑 2 years ago
芋道源码 a5dc4e7876
!839 流程增加抄送功能
Merge pull request !839 from 云开/feature/BPM_CC_develop
2 years ago
芋道源码 3cc127496e
!842 update sql/mysql/ruoyi-vue-pro.sql.
Merge pull request !842 from jay浅蓝/N/A
2 years ago
YunaiV ca55282516 CRM:商机 code review 2 years ago
jay浅蓝 867d8bc3cd
update sql/mysql/ruoyi-vue-pro.sql.
数据库缺少trade:order:query 和 trade:order:update权限,会导致订单的发货和更多按钮无法显示。


Signed-off-by: jay浅蓝 <565215951@qq.com>
2 years ago
kyle 8f171ba3d0 feat: 添加抄送人相关功能以及接口 2 years ago
lzxhqs f361d05940 商机模块 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
zyna bd76ea59a7 Merge remote-tracking branch 'origin/feature/crm' into develop
# Conflicts:
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/CrmBusinessController.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contact/CrmContactController.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contactbusinesslink/CrmContactBusinessLinkController.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/business/CrmBusinessService.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/business/CrmBusinessServiceImpl.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contact/CrmContactBusinessLinkServiceImpl.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contact/CrmContactServiceImpl.java
2 years ago
zyna 8434a8cd68 crm联系人商机功能修改 2 years ago
owen f374e778bb 商品:增加商品浏览记录 2 years ago
owen 4a007f0c98 统计:增加商品统计 2 years ago
liuhongfeng 0d3efe4f80 【优化】ureport2菜单,初始化数据,按照规范重新进行命名处理 2 years ago
liuhongfeng 9350523b35 【新增】ureport2菜单,初始化数据 2 years ago
liuhongfeng 7c43c3a2b1 【新增】ureport2 集成的SQL语句 2 years ago
liuhongfeng 8507fa9172 【新增】ureport2 集成 2 years ago
芋道源码 21a3870c00
!775 crm联系人商机功能
Merge pull request !775 from zyna/feature/crm
2 years ago
YunaiV 73e76ab453 Merge remote-tracking branch 'origin/master' into feature/crm
# Conflicts:
#	yudao-module-crm/yudao-module-crm-biz/src/test/java/cn/iocoder/yudao/module/crm/service/contract/ContractServiceImplTest.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/DictDataController.java
2 years ago
zyna 910bc09e19 crm联系人商机功能 2 years ago
YunaiV 72969e921e crm: 增加基于客户查询回款计划分页 2 years ago
YunaiV f02b9464bd crm: 增加基于客户查询回款分页 2 years ago
YunaiV a5c59c6079 1.9.0 版本发布 2 years ago
YunaiV eeeafcc10c 1.9.0 版本发布 2 years ago
芋道源码 fa1aa51c96
!771 同步最新的 CRM 代码
Merge pull request !771 from 芋道源码/feature/crm
2 years ago
YunaiV 455f8e49fb crm:code review 联系人 2 years ago
zyna 3f3899f5d3 crm联系人review修改,新增地区字段 2 years ago
YunaiV 81f1800f40 优化对 dameng 工作流的适配 2 years ago
芋道源码 d07869f461
!723 feat: 达梦flowable 6.8适配
Merge pull request !723 from dhb52/master
2 years ago
YunaiV 3e9eb59de3 crm:code review 数据权限的实现 2 years ago
JiangQi 0955ad0fc0 promotion:combination-activity:query后多个tab 2 years ago
dhb52 edea17e781 Merge remote-tracking branch 'upstream/master' 2 years ago
YunaiV e40c0e3057 Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
#	pom.xml
#	sql/mysql/pay_wallet.sql
#	yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/mapper/BaseMapperX.java
2 years ago
芋道源码 667957c941
!737 【修改】最新的SQL字符编码不一致导致创建表失败,修改utf8mb4_0900_ai_ci=》utf8mb4_unicode_ci
Merge pull request !737 from souvc/master
2 years ago
liuhongfeng 58ede7d69c 【修改】最新的SQL字符编码不一致导致创建表失败,修改utf8mb4_0900_ai_ci=》utf8mb4_unicode_ci 2 years ago
dhb52 677a6d348f Merge remote-tracking branch 'upstream/master' 2 years ago
YunaiV 8c9c91f0ca 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
YunaiV 5122aee924 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/crm
# Conflicts:
#	sql/mysql/ruoyi-vue-pro.sql
#	yudao-ui-admin/src/views/system/user/index.vue
2 years ago
YunaiV 966690125b crm:code review 联系人 2 years ago
YunaiV 7ac74b44d8 同步最新 SQL 脚本 2 years ago
YunaiV ac80aa97b3 代码生成:优化前端模版的 package 路径 2 years ago
zyna 7af80ba248 crm联系人表结构 2 years ago
Wanwan 5b295d56b6 feat: CRM 客户限制 2 years ago
Wanwan 9abff2c7ad feat: CRM 客户公海配置 2 years ago
dhb52 cba0b08730 doc: 优化文档,patch文件可以放入任意启用的模块 2 years ago
dhb52 e04c4b11df feat: 达梦flowable 6.8适配 2 years ago