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 |
|
xiaqing
|
87778f7fd9
|
客户的公海领取和分配，按照要修调整代码格式
|
2023-11-19 23:23:52 +08:00 |
|
YunaiV
|
827897807f
|
提升启动速度
|
2023-11-19 18:46:16 +08:00 |
|
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
|
2023-11-19 18:39:55 +08:00 |
|
YunaiV
|
7f75f0abfc
|
bpm：code review 指定审批人
|
2023-11-19 18:28:00 +08:00 |
|
YunaiV
|
6fd8d0095c
|
Merge branch 'feature/bpm-earlyAssignee' of https://gitee.com/ykhcool/ruoyi-vue-pro
|
2023-11-19 18:17:28 +08:00 |
|
YunaiV
|
c7a21b2a64
|
mall：优化商品收藏的分页接口
|
2023-11-19 00:58:12 +08:00 |
|
芋道源码
|
667957c941
|
!737 【修改】最新的SQL字符编码不一致导致创建表失败，修改utf8mb4_0900_ai_ci=》utf8mb4_unicode_ci
Merge pull request !737 from souvc/master
|
2023-11-18 16:57:03 +00:00 |
|
芋道源码
|
867293a4f9
|
!724 会员中心商品收藏
Merge pull request !724 from niou233/feature/mall_product_org
|
2023-11-18 16:40:00 +00:00 |
|
YunaiV
|
6270975902
|
优化启动速度
|
2023-11-19 00:37:30 +08:00 |
|
芋道源码
|
7e1ffcbc0c
|
!738 同步部分 CRM 的实现
Merge pull request !738 from 芋道源码/feature/crm
|
2023-11-18 16:35:45 +00: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 |
|
liuhongfeng
|
58ede7d69c
|
【修改】最新的SQL字符编码不一致导致创建表失败，修改utf8mb4_0900_ai_ci=》utf8mb4_unicode_ci
|
2023-11-18 23:30:24 +08:00 |
|