5649 Commits (e4378e56280b36fb093449ea37b083f0354cb615)
 

Author SHA1 Message Date
YunaiV e4378e5628 修复 WxPayOrderNotifyV3Result 的重命名 2 years ago
芋道源码 b580356051
!753 优化对 dameng 工作流的适配
Merge pull request !753 from 芋道源码/feature/bpm-dameng
2 years ago
YunaiV 81f1800f40 优化对 dameng 工作流的适配 2 years ago
芋道源码 d07869f461
!723 feat: 达梦flowable 6.8适配
Merge pull request !723 from dhb52/master
2 years ago
YunaiV a1e6348a37 移除 weixin starter 组件,直接改成 wxjava starter 2 years ago
芋道源码 ee25b8aedb
!752 使用 justauth 替代现有 yudao-spring-boot-starter-biz-social 依赖,减少 starter
Merge pull request !752 from 芋道源码/feature/justauth-op
2 years ago
YunaiV 0bf24c6d16 使用 spring-boot-starter-justauth 替代原本 social starter 2 years ago
YunaiV f2ff30e465 优化 error-code 加载逻辑,失败不影响启动 2 years ago
YunaiV 6d7491fb02 !69fix(system): 修复更新账号时岗位为空时发生的空指针异常 2 years ago
YunaiV 6b3a54c8df !69fix(system): 修复更新账号时岗位为空时发生的空指针异常 2 years ago
YunaiV bb06c11405 更新 README.md,增加主子表、WebSocket 的说明 2 years ago
YunaiV c7ab595460 简化 yudao-ui 目录 2 years ago
YunaiV bd91276155 websocket:重新封装 websocket 组件,支持 token 认证,并增加 WebSocketMessageListener 方便处理消息 2 years ago
芋道源码 ae763f727f
!749 增加 WebSocket 的全新支持
Merge pull request !749 from 芋道源码/feature/websocket
2 years ago
芋道源码 d4bc6ce52d
!742 mysql脚本的菜单数据中promotion:combination-activity:query后多个tab
Merge pull request !742 from PeterChina/master-pr
2 years ago
YunaiV a597eb17d4 websocket:修复 RedisWebSocketMessageConsumer 注册失效的问题 2 years ago
YunaiV 0233b092b8 websocket:重新封装 websocket 组件,支持 sender 广播 2 years ago
dhb52 be20178f12 Merge remote-tracking branch 'upstream/master' 2 years ago
YunaiV 1941a7b3e6 websocket:重新封装 websocket 组件,支持 token 认证,并增加 WebSocketMessageListener 方便处理消息 2 years ago
YunaiV 6a61db8508 security: query string 支持传递 token 参数,解决 ws token 认证 2 years ago
JiangQi 0955ad0fc0 promotion:combination-activity:query后多个tab 2 years ago
芋道源码 41c324acc3
!741 sms:移除 SmsCodeMapping + SmsCommonResult,简化短信的封装
Merge pull request !741 from 芋道源码/feature/sms-op
2 years ago
dhb52 edea17e781 Merge remote-tracking branch 'upstream/master' 2 years ago
YunaiV 7506a1b012 sms:移除 sendCode、sendMsg 字段 2 years ago
YunaiV 6f135303d8 sms:移除 SmsCodeMapping + SmsCommonResult,简化短信的封装 2 years ago
YunaiV 822e441765 使用 justauth 替代现有 yudao-spring-boot-starter-biz-social 依赖,减少 starter 2 years ago
YunaiV 827897807f 提升启动速度 2 years ago
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
2 years ago
YunaiV 7f75f0abfc bpm:code review 指定审批人 2 years ago
YunaiV 6fd8d0095c Merge branch 'feature/bpm-earlyAssignee' of https://gitee.com/ykhcool/ruoyi-vue-pro 2 years ago
YunaiV c7a21b2a64 mall:优化商品收藏的分页接口 2 years ago
芋道源码 667957c941
!737 【修改】最新的SQL字符编码不一致导致创建表失败,修改utf8mb4_0900_ai_ci=》utf8mb4_unicode_ci
Merge pull request !737 from souvc/master
2 years ago
芋道源码 867293a4f9
!724 会员中心商品收藏
Merge pull request !724 from niou233/feature/mall_product_org
2 years ago
YunaiV 6270975902 优化启动速度 2 years ago
芋道源码 7e1ffcbc0c
!738 同步部分 CRM 的实现
Merge pull request !738 from 芋道源码/feature/crm
2 years ago
YunaiV f589881de5 code review:客户的分配和领取 2 years ago
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
2 years ago
YunaiV 86050d411b code review:权限模块 2 years ago
liuhongfeng 58ede7d69c 【修改】最新的SQL字符编码不一致导致创建表失败,修改utf8mb4_0900_ai_ci=》utf8mb4_unicode_ci 2 years ago
YunaiV 716b081464 crm:合并最新的数据权限 2 years ago
dhb52 677a6d348f Merge remote-tracking branch 'upstream/master' 2 years ago
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
2 years ago
YunaiV 8c9c91f0ca crm:code review 配置管理 2 years ago
YunaiV 90f135ad95 Merge branch 'feature/crm' of https://gitee.com/jiangwanwan/ruoyi-vue-pro into feature/crm
# Conflicts:
#	sql/mysql/crm.sql
2 years ago
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
2 years ago
YunaiV 966690125b crm:code review 联系人 2 years ago
芋道源码 bf8bfef8cb
!727 crm联系人字段修改
Merge pull request !727 from zyna/feature/crm
2 years ago
芋道源码 a440b354ba
!735 商城装修
Merge pull request !735 from 疯狂的世界/feature/mall_product
2 years ago
芋道源码 29ff418091
!736 新增主子表、树表的代码生成
Merge pull request !736 from 芋道源码/feature/sub-table
2 years ago
YunaiV 7ac74b44d8 同步最新 SQL 脚本 2 years ago