260 Commits (ff7e492887408c68b962075661b30757c061bf72)

Author SHA1 Message Date
puhui999 6b426fcd01 CRM: 修复一下差异 2 years ago
puhui999 ad4044f932 Merge remote-tracking branch 'yudao/develop' into develop
# Conflicts:
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/convert/customer/CrmCustomerConvert.java
2 years ago
puhui999 19fa65b0c3 CRM: 新增跟进记录 2 years ago
puhui999 ba103d6e86 CRM: 完善一些 TODO 提到的问题 2 years ago
puhui999 1a5fe6fa9a CRM: 完善客户、联系人、合同、回款计划、回款的操作日志 2 years ago
puhui999 9bba1ce8a4 新增 ParseFunctionNameConstants 常量枚举 2 years ago
min 0ee7fedea8 CRM:【线索】使用BeanUtils替换mapstruct 2 years ago
min 99b8465e29 CRM:【线索】SaveReqVO去除客户编号字段 2 years ago
min 1280f49a04 CRM:【线索】转化为客户接口修改 2 years ago
YunaiV 722b33513c 📖 CRM:code review 线索模块 2 years ago
YunaiV 6a93484260 📖 CRM:code review 线索模块 2 years ago
min 81f838c5d2 CRM:【线索】创建、更新线索时添加校验,改用相同vo 2 years ago
min 4d68e5e747 CRM:【线索】创建线索时客户改为非必填 2 years ago
min 4237cfb4a9 CRM:【线索】线索转化为客户 2 years ago
YunaiV 772b794374 📖 CRM:code review CRM 产品分类 2 years ago
anhaohao 4afff6185e 新增:CRM 产品分类和产品,接入操作日志,数据权限控制 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 19d5a0c2aa 📖 CRM:code review crm 联系人新增操作日志 2 years ago
zyna 44d828023c crm联系人新增操作日志 2 years ago
puhui999 68f5edaa88 CRM-客户: 完善一些 TODO 2 years ago
puhui999 3170e7fd97 CRM-客户: 简化客户公海配置 VO,完善相关操作日志 2 years ago
puhui999 9ce50ec369 CRM-客户限制配置:VO 简化 2 years ago
puhui999 269816446a CRM-客户:日志表达式调整 2 years ago
puhui999 a1c17b9b00 CRM-客户:日志表达式调整 2 years ago
puhui999 d8bb55fc0b CRM-客户:完善操作日志 2 years ago
puhui999 ea4b4b8956 CRM-客户:精简 VO 2 years ago
YunaiV a974d055b6 📖 CRM:【还款】code review 还款的代码,补全对应的 todo list 2 years ago
YunaiV c6a9751511 📖 CRM:【合同】code review 合同的代码,补全对应的 todo list 2 years ago
YunaiV 2668e0cfeb 📖 CRM:【产品】code review 产品的代码,补全对应的 todo list 2 years ago
YunaiV b9f1e8ffaf 📖 CRM:【联系人】code review 商机的代码,补全对应的 todo list 2 years ago
YunaiV 02324f9e60 CRM:【联系人】统一字段 2 years ago
YunaiV cff6e520ee 📖 CRM:【联系人】code review 联系人的代码,补全对应的 todo list 2 years ago
YunaiV f8f5e525be CRM:新增跟进记录表 2 years ago
YunaiV 2e7c3e09a9 📖 CRM:code review 所有代码,补充对应 todo 2 years ago
YunaiV d0df0e8e16 📖 CRM:【客户】优化锁定客户的逻辑实现 2 years ago
YunaiV 0253846fdf Merge branch 'develop' of https://gitee.com/zh8790/ruoyi-vue-pro_develop into develop
# Conflicts:
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerServiceImpl.java
2 years ago
YunaiV 1da8006af3 📖 CRM:【客户】完善列表、新增、修改接口的 todo 2 years ago
YunaiV 9e3055ee1e 📖 CRM:code review 商机模块 2 years ago
YunaiV 2d0537387b Merge branch 'develop' of https://gitee.com/zyna/ruoyi-vue-pro into develop
# Conflicts:
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contact/CrmContactBusinessLinkServiceImpl.java
2 years ago
YunaiV 8c9b483ac5 📖 code review 操作日志的实现 2 years ago
puhui999 e5377074d5 数据权限:完善 code review 提到的问题 2 years ago
puhui999 6950368991 操作日志:完善 code review 提到的问题 2 years ago
YunaiV 5de6a8bd23 📖 code review:操作日志的实现 2 years ago
puhui999 e8ade5f1fe crm:完善一些遗留的 TODO 2 years ago
puhui999 f56d8a2751 重构操作日志记录实现 2 years ago
puhui999 1fae341cae 重构操作日志记录实现 2 years ago
puhui999 55a215da44 CRM-数据权限:完善数据权限补全管理员和公海相关情况处理逻辑 2 years ago
puhui999 3e91ac73c4 CRM:完善数据分页查询条件构造 CrmQueryWrapperUtils 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
YunaiV ddb6fe7ec8 📖 CRM:code review 客户管理的数据权限、操作权限 2 years ago
puhui999 daf4651a4f 系统操作日志:集成 mzt-biz-log 5,增加日志保存和查询接口 2 years ago
puhui999 3c74b22933 系统操作日志:集成 mzt-biz-log 4 2 years ago
puhui999 c74881c8f0 系统操作日志:集成 mzt-biz-log 3 2 years ago
puhui999 13d6c42a48 系统操作日志:集成 mzt-biz-log 2 2 years ago
puhui999 c5cc818a49 系统操作日志:集成 mzt-biz-log 2 years ago
puhui999 8fa8f2890b CRM: 线索、联系人、回款、回款计划新增数据权限转移 2 years ago
puhui999 c234f5b5f8 CRM: 完善数据权限 2 years ago
puhui999 1ac68aca97 CRM-回款计划:添加数据权限 2 years ago
puhui999 e4d3175f06 CRM-数据权限:完善 review 提到的问题 2 years ago
Joey 9bac10c6f7 完善客户锁定/解锁接口,校验锁定上限 2 years ago
YunaiV 23df8633f4 📖 CRM:code review 数据权限的实现 2 years ago
puhui999 7c54affb16 CRM-合同:完善数据权限,新增权限关联、场景分页查询,新增权限关联批量查询 2 years ago
puhui999 f69a18fd23 CRM-联系人:完善数据权限,新增权限关联、场景分页查询,新增权限关联批量查询 2 years ago
puhui999 490418a1fc CRM-线索:完善数据权限,新增权限关联、场景分页查询,新增权限关联批量查询 2 years ago
puhui999 9ea0607339 CRM-商机:完善数据权限,新增权限关联、场景分页查询,新增权限关联批量查询 2 years ago
puhui999 5c395fc1c4 CRM: 完善 code review 数据权限提到的问题,重新封装 CrmQueryWrapperUtils 2 years ago
YunaiV 98697ee075 ⬆️ 2 years ago
YunaiV 3707662187 📈 CRM:code review 数据权限 2 years ago
YunaiV d430063eec Merge remote-tracking branch 'puhui/feature/crm' into feature/crm
# Conflicts:
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApiImpl.java
2 years ago
YunaiV a36fe8c40e 📈 CRM:code review 联系人商机功能 2 years ago
芋道源码 21a3870c00
!775 crm联系人商机功能
Merge pull request !775 from zyna/feature/crm
2 years ago
YunaiV 3678752a61 🔨 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
YunaiV a11d5dc5f1 🔨 CRM:优化产品代码的实现 2 years ago
puhui999 d59d1428d7 Merge remote-tracking branch 'yudao/feature/crm' into feature/crm 2 years ago
芋道源码 c463f831f4
!776 【CRM:优化产品以及产品分类】
Merge pull request !776 from ZanGe丶/feature/crm
2 years ago
puhui999 455a4ebc7b CRM-客户:实现数据权限、场景检索和公海数据分页查询 2 years ago
puhui999 78165f2161 CRM: 新增 CRM 分页查询工具类,实现通用构造 crm 数据类型数据分页查询条件 2 years ago
puhui999 b2621c8891 CRM-客户: 新增关注和取消关注客户接口 2 years ago
puhui999 9c1687dc25 CRM: 新增关注数据模块 2 years ago
ZanGe丶 d2e965fb02 【CRM:优化产品以及产品分类】 2 years ago
zyna 910bc09e19 crm联系人商机功能 2 years ago
YunaiV 72969e921e crm: 增加基于客户查询回款计划分页 2 years ago
YunaiV f02b9464bd crm: 增加基于客户查询回款分页 2 years ago
YunaiV eeeafcc10c 1.9.0 版本发布 2 years ago
YunaiV db03b10d24 crm: 增加基于客户查询商机分页 2 years ago
YunaiV 2d9f5cc4d0 crm: 1)调整合同的 CRM 前缀;2)增加基于客户查询合同分页 2 years ago
YunaiV fe4b51b9ad crm: 完善数据权限的逻辑 2 years ago
YunaiV 53b8e37f36 crm: 增加联系人,基于客户的读取接口 2 years ago
YunaiV 1a93e3a110 crm:code review 联系人 2 years ago
芋道源码 591bc36737
!763 crm联系人review修改
Merge pull request !763 from zyna/feature/crm
2 years ago
YunaiV 36a51b68d9 crm:code review 数据权限 2 years ago
puhui999 79600774ec crm-客户:分页查询 mapper 还是得拆成两个,怎么查逻辑交给 service 去做处理 2 years ago
zyna 1580789334 crm联系人review修改 2 years ago
puhui999 6c536caad4 crm:完善 code review 数据权限提到的问题 2 years ago
YunaiV 492adfe8e5 crm:code review 数据权限 2 years ago
YunaiV 455f8e49fb crm:code review 联系人 2 years ago
zyna 3f3899f5d3 crm联系人review修改,新增地区字段 2 years ago