Wanwan
|
ab3748d102
|
feat: 客户配置 review 修改
|
2023-11-25 23:54:08 +08:00 |
|
YunaiV
|
63f9bcb0a3
|
crm：code review 商机类型、状态
|
2023-11-25 12:02:03 +08:00 |
|
YunaiV
|
3e9eb59de3
|
crm：code review 数据权限的实现
|
2023-11-25 10:55:47 +08:00 |
|
YunaiV
|
899e40deb9
|
crm：code review 数据权限的实现
|
2023-11-25 10:02:55 +08:00 |
|
YunaiV
|
d1579499f4
|
Merge remote-tracking branch 'ljlleo/feature/crm' into feature/crm
# 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/dal/mysql/customer/CrmCustomerMapper.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerServiceImpl.java
|
2023-11-24 23:58:49 +08:00 |
|
YunaiV
|
8e480162c4
|
Merge remote-tracking branch 'origin/feature/crm' into feature/crm
# Conflicts:
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/customer/CrmCustomerMapper.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerService.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerServiceImpl.java
|
2023-11-24 23:55:10 +08:00 |
|
YunaiV
|
13e5d70be7
|
crm：解决冲突
|
2023-11-24 23:54:23 +08:00 |
|
YunaiV
|
ec67e63c67
|
crm：code review 客户的公海领取和分配
|
2023-11-24 23:53:28 +08:00 |
|
YunaiV
|
1842549634
|
crm：code review 客户的公海领取和分配
|
2023-11-24 23:11:58 +08:00 |
|
芋道源码
|
9a5f6f13b4
|
!739 客户的公海领取和分配，按照要修调整代码格式
Merge pull request !739 from QingX/feature/crm
|
2023-11-24 14:58:23 +00:00 |
|
ljlleo
|
4e1d9d6292
|
商机、商机状态类型和商机状态
|
2023-11-24 14:24:04 +08:00 |
|
puhui999
|
0d821d705d
|
crm-客户管理：完善客户、公海客户分页查询
|
2023-11-23 10:12:50 +08:00 |
|
puhui999
|
b41d469d46
|
crm-客户管理：新增客户放入公海和领取公海客户
|
2023-11-22 18:44:49 +08:00 |
|
puhui999
|
77d7bcc73f
|
crm-数据权限：完善数据权限 code review 提到的问题
|
2023-11-22 17:56:13 +08:00 |
|
puhui999
|
780526f484
|
crm-数据权限：完善数据权限相关操作接口
|
2023-11-22 17:27:00 +08:00 |
|
xiaqing
|
87778f7fd9
|
客户的公海领取和分配，按照要修调整代码格式
|
2023-11-19 23:23:52 +08:00 |
|
YunaiV
|
f589881de5
|
code review：客户的分配和领取
|
2023-11-19 00:05:06 +08:00 |
|
YunaiV
|
e519b41244
|
Merge branch 'feature/crm' of https://gitee.com/SummerQing/ruoyi-vue-pro into feature/crm
# Conflicts:
# yudao-module-crm/yudao-module-crm-api/src/main/java/cn/iocoder/yudao/module/crm/enums/ErrorCodeConstants.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/CrmCustomerController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerServiceImpl.java
|
2023-11-18 23:56:08 +08:00 |
|
YunaiV
|
86050d411b
|
code review：权限模块
|
2023-11-18 23:45:24 +08:00 |
|
YunaiV
|
716b081464
|
crm：合并最新的数据权限
|
2023-11-18 22:31:05 +08:00 |
|
YunaiV
|
8c9873c425
|
Merge branch 'feature/crm' of https://gitee.com/puhui999/ruoyi-vue-pro into feature/crm
# Conflicts:
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/CrmCustomerController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/convert/contact/ContactConvert.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/convert/customer/CrmCustomerConvert.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contact/ContactServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerServiceImpl.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/dept/PostConvert.java
|
2023-11-18 22:25:13 +08:00 |
|
YunaiV
|
8c9c91f0ca
|
crm：code review 配置管理
|
2023-11-18 22:12:12 +08:00 |
|
YunaiV
|
90f135ad95
|
Merge branch 'feature/crm' of https://gitee.com/jiangwanwan/ruoyi-vue-pro into feature/crm
# Conflicts:
# sql/mysql/crm.sql
|
2023-11-18 21:17:11 +08:00 |
|
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
|
2023-11-18 20:44:06 +08:00 |
|
YunaiV
|
966690125b
|
crm：code review 联系人
|
2023-11-18 20:43:32 +08:00 |
|
芋道源码
|
bf8bfef8cb
|
!727 crm联系人字段修改
Merge pull request !727 from zyna/feature/crm
|
2023-11-18 12:12:08 +00:00 |
|
芋道源码
|
29ff418091
|
!736 新增主子表、树表的代码生成
Merge pull request !736 from 芋道源码/feature/sub-table
|
2023-11-18 09:57:59 +00:00 |
|
YunaiV
|
7ac74b44d8
|
同步最新 SQL 脚本
|
2023-11-18 17:49:01 +08:00 |
|
YunaiV
|
ac80aa97b3
|
代码生成：优化前端模版的 package 路径
|
2023-11-18 17:41:37 +08:00 |
|
zhijiantianya@gmail.com
|
067d53ac48
|
代码生成器：增加单元测试，🛫
|
2023-11-17 19:39:32 +08:00 |
|
YunaiV
|
ee918a6d3f
|
代码生成：增加主子表 erp 模式的示例
|
2023-11-17 13:21:07 +08:00 |
|
YunaiV
|
d2aee55ed2
|
代码生成：增加主子表 inner 模式的示例
|
2023-11-16 23:48:12 +08:00 |
|
YunaiV
|
2aecdbf09e
|
代码生成：增加主子表 normal 模式的示例
|
2023-11-16 23:23:46 +08:00 |
|
YunaiV
|
5b9879ca8d
|
代码生成：增加 tree 示例
|
2023-11-16 20:40:13 +08:00 |
|
YunaiV
|
01a55b93c2
|
代码生成：增加更全的 tree 场景下的新增/修改校验
|
2023-11-16 20:01:44 +08:00 |
|
YunaiV
|
f5ea270be3
|
部门：优化父部门的校验逻辑，为代码生成做个铺垫？！
|
2023-11-16 12:55:43 +08:00 |
|
YunaiV
|
a2f7067494
|
代码生成：支持树形表结构的配置
|
2023-11-16 00:11:31 +08:00 |
|
YunaiV
|
0d49691aa0
|
代码生成：增加 crud 单表示例
|
2023-11-15 23:48:30 +08:00 |
|
YunaiV
|
d83e0413b8
|
清理一波 demo 示例代码，准备重新生成
|
2023-11-15 21:46:10 +08:00 |
|
zhijiantianya@gmail.com
|
413640f593
|
代码生成器：简化 vo 和 convert 的生成逻辑
|
2023-11-15 21:05:00 +08:00 |
|
zhijiantianya@gmail.com
|
91d7938ddf
|
代码生成器：简化 vo 和 convert 的生成逻辑
|
2023-11-15 21:03:16 +08:00 |
|
zhijiantianya@gmail.com
|
7e6b084f77
|
Merge branch 'feature/vo-optimize' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/sub-table
|
2023-11-15 21:02:22 +08:00 |
|
YunaiV
|
5e6e02e4f4
|
vo 简化：使用 BeanUtils 替代 mapstruct 转换
|
2023-11-15 09:19:51 +08:00 |
|
YunaiV
|
ddb5bce0a2
|
vo 简化：post 重构
|
2023-11-14 22:37:46 +08:00 |
|
zhijiantianya@gmail.com
|
b47c4fbd8d
|
代码生成器：增加树形结构的 vm 模版
|
2023-11-14 19:37:35 +08:00 |
|
YunaiV
|
06649624e5
|
代码生成：支持设置主子表的信息
|
2023-11-14 12:57:55 +08:00 |
|
puhui999
|
794649ea8a
|
CRM-数据权限：完善团队成员相关操作
|
2023-11-14 11:23:52 +08:00 |
|
YunaiV
|
a75bb825d7
|
代码生成：支持设置主子表的信息
|
2023-11-14 09:51:10 +08:00 |
|
YunaiV
|
a51e9645ef
|
代码生成：进一步完成 erp 模版
|
2023-11-13 21:46:54 +08:00 |
|
zhijiantianya@gmail.com
|
7c48aaba8a
|
代码生成器：进一步完善 erp 生成模版
|
2023-11-13 20:37:15 +08:00 |
|