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 |
|
芋道源码
|
d4bc6ce52d
|
!742 mysql脚本的菜单数据中promotion:combination-activity:query后多个tab
Merge pull request !742 from PeterChina/master-pr
|
2023-11-24 11:57:46 +00:00 |
|
YunaiV
|
4a3aa1fa08
|
营销：适配商城装修组件【优惠券】
|
2023-11-24 19:55:07 +08:00 |
|
芋道源码
|
3021b405d2
|
!743 商城装修
Merge pull request !743 from 疯狂的世界/feature/mall_product
|
2023-11-24 11:52:32 +00:00 |
|
YunaiV
|
a597eb17d4
|
websocket：修复 RedisWebSocketMessageConsumer 注册失效的问题
|
2023-11-24 18:56:19 +08:00 |
|
ljlleo
|
4e1d9d6292
|
商机、商机状态类型和商机状态
|
2023-11-24 14:24:04 +08:00 |
|
YunaiV
|
0233b092b8
|
websocket：重新封装 websocket 组件，支持 sender 广播
|
2023-11-24 00:32:52 +08:00 |
|
dhb52
|
be20178f12
|
Merge remote-tracking branch 'upstream/master'
|
2023-11-23 22:44:03 +08:00 |
|
puhui999
|
0d821d705d
|
crm-客户管理：完善客户、公海客户分页查询
|
2023-11-23 10:12:50 +08:00 |
|
YunaiV
|
1941a7b3e6
|
websocket：重新封装 websocket 组件，支持 token 认证，并增加 WebSocketMessageListener 方便处理消息
|
2023-11-22 23:17:50 +08:00 |
|
YunaiV
|
6a61db8508
|
security: query string 支持传递 token 参数，解决 ws token 认证
|
2023-11-22 23:02:59 +08:00 |
|
liuhongfeng
|
6b86793b9d
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2023-11-22 22:31:17 +08:00 |
|
liuhongfeng
|
05369a36a3
|
【新增】ureport2菜单，初始化数据
|
2023-11-22 22:15:08 +08:00 |
|
liuhongfeng
|
770086ac5b
|
【修改】ureport2 集成的SQL语句，并适配数据库存储方式
|
2023-11-22 22:13:05 +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 |
|
owen
|
49accc946d
|
营销：适配商城装修组件【优惠券】
|
2023-11-22 16:58:01 +08:00 |
|
JiangQi
|
0955ad0fc0
|
promotion:combination-activity:query后多个tab
|
2023-11-22 09:22:40 +08:00 |
|
芋道源码
|
41c324acc3
|
!741 sms：移除 SmsCodeMapping + SmsCommonResult，简化短信的封装
Merge pull request !741 from 芋道源码/feature/sms-op
|
2023-11-21 15:34:58 +00:00 |
|
dhb52
|
edea17e781
|
Merge remote-tracking branch 'upstream/master'
|
2023-11-21 23:19:49 +08:00 |
|
YunaiV
|
7506a1b012
|
sms：移除 sendCode、sendMsg 字段
|
2023-11-21 22:53:57 +08:00 |
|
YunaiV
|
6f135303d8
|
sms：移除 SmsCodeMapping + SmsCommonResult，简化短信的封装
|
2023-11-21 22:14:07 +08:00 |
|
puhui999
|
3d2022e31f
|
代码生成：完善 vue2 代码生成单元测试
|
2023-11-21 16:22:16 +08:00 |
|
puhui999
|
c50d27f5cb
|
代码生成：完善 vue2 模版，适配树表和主子表
|
2023-11-21 11:58:04 +08:00 |
|
puhui999
|
80db28ee5b
|
代码生成：重构 vue2 模版，适配树表和主子表
|
2023-11-21 10:49:43 +08:00 |
|
liuhongfeng
|
b5a667cb9c
|
【新增】ureport2 集成的SQL语句
|
2023-11-20 23:31:21 +08:00 |
|
YunaiV
|
822e441765
|
使用 justauth 替代现有 yudao-spring-boot-starter-biz-social 依赖，减少 starter
|
2023-11-20 23:27:41 +08:00 |
|
liuhongfeng
|
a0e3cb11ab
|
【新增】ureport2 集成
|
2023-11-20 23:14:52 +08:00 |
|
puhui999
|
737ea4635c
|
Merge remote-tracking branch 'yudao/feature/sub-table' into feature/sub-table
# Conflicts:
# sql/mysql/ruoyi-vue-pro.sql
|
2023-11-20 09:57:24 +08:00 |
|