puhui999
|
b4d16b368d
|
Merge remote-tracking branch 'yudao/feature/sub-table' into feature/sub-table
|
2023-11-27 21:07:45 +08:00 |
|
puhui999
|
5ebebf1579
|
代码生成：vue2 代码模拟格式调整
|
2023-11-27 21:05:41 +08:00 |
|
YunaiV
|
fd2af50202
|
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/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-27 20:52:44 +08:00 |
|
YunaiV
|
492adfe8e5
|
crm：code review 数据权限
|
2023-11-27 20:51:51 +08:00 |
|
YunaiV
|
455f8e49fb
|
crm：code review 联系人
|
2023-11-27 20:42:35 +08:00 |
|
zyna
|
16084d468d
|
crm联系人删除多余文件
|
2023-11-27 20:42:35 +08:00 |
|
zyna
|
3f3899f5d3
|
crm联系人review修改，新增地区字段
|
2023-11-27 20:42:34 +08:00 |
|
YunaiV
|
d6d4e50c4b
|
crm：code review 联系人
|
2023-11-27 20:28:18 +08:00 |
|
芋道源码
|
4e897f3a9b
|
!755 crm联系人review修改
Merge pull request !755 from zyna/feature/crm
|
2023-11-27 12:06:53 +00:00 |
|
YunaiV
|
df51a678eb
|
code review：vue2 主子表的生成
|
2023-11-27 17:09:53 +08:00 |
|
芋道源码
|
12bcee2a72
|
!734 代码生成：重构 vue2 代码生成模版，使用 async await 优化代码层次，适配树表和主子表
Merge pull request !734 from puhui999/feature/sub-table
|
2023-11-27 08:53:41 +00:00 |
|
puhui999
|
6d228828f4
|
application-local.yaml 恢复
|
2023-11-27 16:34:55 +08:00 |
|
puhui999
|
4f42e7ca68
|
代码生成：Vue2 界面：修正 $refs
|
2023-11-27 16:31:06 +08:00 |
|
puhui999
|
86160f40de
|
代码生成：重构 vue2 代码生成模版，使用 async await 优化代码层次
|
2023-11-27 16:30:30 +08:00 |
|
puhui999
|
4a51b20155
|
crm-客户：修复合并差异
|
2023-11-27 12:14:32 +08:00 |
|
puhui999
|
f87d73724b
|
Merge remote-tracking branch 'yudao/feature/crm' 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/test/java/cn/iocoder/yudao/module/crm/service/business/BusinessStatusTypeServiceImplTest.java
|
2023-11-27 12:12:52 +08:00 |
|
puhui999
|
8f06d02293
|
crm-客户：完善 code review 提到的问题
|
2023-11-27 12:00:53 +08:00 |
|
puhui999
|
7f569f3299
|
crm-数据权限：完善数据权限
|
2023-11-27 10:55:32 +08:00 |
|
zyna
|
930b5a8dd5
|
crm联系人删除多余文件
|
2023-11-26 22:03:06 +08:00 |
|
zyna
|
d2c6c285f7
|
crm联系人review修改，新增地区字段
|
2023-11-26 22:00:14 +08:00 |
|
YunaiV
|
f766474ff4
|
crm：code review 客户配置
|
2023-11-26 19:57:40 +08:00 |
|
芋道源码
|
18c8a11a89
|
!751 feat: 客户配置 review 修改
Merge pull request !751 from wanwan/feature/crm
|
2023-11-26 11:46:53 +00:00 |
|
YunaiV
|
e4378e5628
|
修复 WxPayOrderNotifyV3Result 的重命名
|
2023-11-26 19:24:11 +08:00 |
|
芋道源码
|
b580356051
|
!753 优化对 dameng 工作流的适配
Merge pull request !753 from 芋道源码/feature/bpm-dameng
|
2023-11-26 11:21:19 +00:00 |
|
YunaiV
|
81f1800f40
|
优化对 dameng 工作流的适配
|
2023-11-26 19:19:31 +08:00 |
|
芋道源码
|
d07869f461
|
!723 feat: 达梦flowable 6.8适配
Merge pull request !723 from dhb52/master
|
2023-11-26 10:55:13 +00:00 |
|
YunaiV
|
a1e6348a37
|
移除 weixin starter 组件，直接改成 wxjava starter
|
2023-11-26 17:08:16 +08:00 |
|
芋道源码
|
ee25b8aedb
|
!752 使用 justauth 替代现有 yudao-spring-boot-starter-biz-social 依赖，减少 starter
Merge pull request !752 from 芋道源码/feature/justauth-op
|
2023-11-26 03:42:16 +00:00 |
|
YunaiV
|
0bf24c6d16
|
使用 spring-boot-starter-justauth 替代原本 social starter
|
2023-11-26 11:39:29 +08:00 |
|
Wanwan
|
fbf864b6b4
|
fix: 修复客户公海配置设置为不启用时保存字段没有清空的 bug
|
2023-11-26 02:00:23 +08:00 |
|
Wanwan
|
033f13c6ad
|
feat: 客户配置 review 修改
|
2023-11-26 00:27:09 +08:00 |
|
Wanwan
|
ab3748d102
|
feat: 客户配置 review 修改
|
2023-11-25 23:54:08 +08:00 |
|
YunaiV
|
f2ff30e465
|
优化 error-code 加载逻辑，失败不影响启动
|
2023-11-25 23:00:31 +08:00 |
|
YunaiV
|
6d7491fb02
|
!69fix(system): 修复更新账号时岗位为空时发生的空指针异常
|
2023-11-25 22:34:08 +08:00 |
|
YunaiV
|
6b3a54c8df
|
!69fix(system): 修复更新账号时岗位为空时发生的空指针异常
|
2023-11-25 22:28:05 +08:00 |
|
YunaiV
|
bb06c11405
|
更新 README.md，增加主子表、WebSocket 的说明
|
2023-11-25 22:26:23 +08:00 |
|
YunaiV
|
c7ab595460
|
简化 yudao-ui 目录
|
2023-11-25 22:05:57 +08:00 |
|
YunaiV
|
bd91276155
|
websocket：重新封装 websocket 组件，支持 token 认证，并增加 WebSocketMessageListener 方便处理消息
|
2023-11-25 20:44:36 +08:00 |
|
芋道源码
|
ae763f727f
|
!749 增加 WebSocket 的全新支持
Merge pull request !749 from 芋道源码/feature/websocket
|
2023-11-25 11:31:02 +00: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 |
|
YunaiV
|
fb8f5b6339
|
report：code review ureport 的集成
|
2023-11-24 22:18:59 +08:00 |
|
芋道源码
|
8bcc732c33
|
!744 【新增】ureport2 集成
Merge pull request !744 from souvc/master
|
2023-11-24 12:41:21 +00:00 |
|