YunaiV
|
eaa22e7a56
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# pom.xml
# yudao-dependencies/pom.xml
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmModelController.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModeImportReqVO.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModelSaveReqVO.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModelUpdateReqVO.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmTaskController.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/BpmTaskCandidateDeptLeaderStrategy.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/BpmTaskCandidateDeptMemberStrategy.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/BpmTaskCandidateGroupStrategy.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/BpmTaskCandidatePostStrategy.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/BpmTaskCandidateRoleStrategy.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/BpmTaskCandidateStartUserSelectStrategy.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/BpmTaskCandidateUserStrategy.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/listener/BpmTaskEventListener.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmModelService.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmModelServiceImpl.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmProcessDefinitionServiceImpl.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/message/BpmMessageService.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmActivityServiceImpl.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceService.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmTaskService.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmTaskServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/framework/permission/core/aop/CrmPermissionAspect.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApiImpl.java
# yudao-server/pom.xml
|
2024-10-04 17:16:23 +08:00 |
|
YunaiV
|
9334edc9ea
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/bpm
# Conflicts:
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
|
2024-10-03 11:28:22 +08:00 |
|
YunaiV
|
44b466c678
|
Merge branch 'feature/iot' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk17
# Conflicts:
# pom.xml
# yudao-dependencies/pom.xml
# yudao-server/pom.xml
|
2024-10-01 19:54:22 +08:00 |
|
YunaiV
|
ef4e7176a2
|
【依赖优化】snapshot to SNAPSHOT，解决 https://github.com/YunaiV/ruoyi-vue-pro/issues/417 问题
|
2024-10-01 16:14:58 +08:00 |
|
YunaiV
|
2bbb7f86fe
|
【同步】BOOT 和 CLOUD 的功能
|
2024-10-01 14:39:30 +08:00 |
|
YunaiV
|
1e69face92
|
【代码评审】IOT：产品的管理
|
2024-09-07 20:38:49 +08:00 |
|
YunaiV
|
840cfad84a
|
【功能优化】商城：价格计算时，返回可用 + 不可用的优惠劵
|
2024-09-07 12:05:42 +08:00 |
|
YunaiV
|
d3f28b92a7
|
【代码优化】SYSTEM：认证令牌的操作，增加 @Transactional 注解
|
2024-09-03 10:34:44 +08:00 |
|
YunaiV
|
b632726a69
|
【功能优化】支付：支付应用，增加 appKey 标识，用于不同接入方的标识
|
2024-08-18 16:33:55 +08:00 |
|
YunaiV
|
1dadfb8fba
|
【功能优化】支付：支付应用，增加 appKey 标识，用于不同接入方的标识
|
2024-08-18 15:30:35 +08:00 |
|
陈玄礼
|
6eb40aa544
|
!1041 支付应用，增加 appKey 标识，用于不同接入方的标识
* feat[yudao-module-pay]: 更新新增和更新支付应用时校验逻辑
* fix[yudao-module-trade]: 为支付应用标识提供缺省值
* fix[yudao-module-pay]: appKey注释应用编码更新为应用标识
* feat[yudao-module-pay]: 为支付应用新增支付编码属性
|
2024-08-18 07:02:09 +00:00 |
|
安浩浩
|
36a828866b
|
新增：iot 产品
|
2024-08-17 19:41:42 +08:00 |
|
YunaiV
|
923b967766
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/bpm
|
2024-08-10 19:31:06 +08:00 |
|
安浩浩
|
b47176c96e
|
新增：iot 模块 集成 emqx 接收 mqtt 接收消息
|
2024-08-06 22:17:29 +08:00 |
|
YunaiV
|
68dd270258
|
【代码修复】MALL：更新库存时，同时更新销量，和 taobao 保持一致的逻辑
|
2024-07-23 12:44:57 +08:00 |
|
YunaiV
|
e2f3491295
|
【代码修复】MALL：更新库存时，同时更新销量，和 taobao 保持一致的逻辑
|
2024-07-23 12:43:49 +08:00 |
|
YunaiV
|
41afea6818
|
【功能新增】MALL：新增 mall 客服
|
2024-07-13 12:14:07 +08:00 |
|
芋道源码
|
b586a09b90
|
!1011 新增 mall 客服
Merge pull request !1011 from 芋道源码/develop
|
2024-07-13 04:11:46 +00:00 |
|
YunaiV
|
c3af08900c
|
【模块新增】AI：支持通义千问、文心一言、讯飞星火、智谱、DeepSeek 等国内外大模型能力
|
2024-07-12 09:32:17 +08:00 |
|
YunaiV
|
ca4ee3be1f
|
【优化】AI：AI 相关 SQL
|
2024-05-25 13:31:07 +08:00 |
|
YunaiV
|
b65ccd769f
|
【同步】BPM：合并 master-jdk17 代码
|
2024-05-19 11:18:30 +08:00 |
|
YunaiV
|
52c86cd290
|
【优化】CRM：员工业绩统计的实现
|
2024-05-07 23:08:38 +08:00 |
|
YunaiV
|
62c6c4b9bd
|
同步 develop 最新代码
|
2024-04-12 19:17:49 +08:00 |
|
puhui999
|
ce013a2562
|
CRM: 新增客户行业、来源、级别统计数据统计
|
2024-03-24 17:15:56 +08:00 |
|
YunaiV
|
8dcc12f215
|
CRM：code review 客户总量统计
|
2024-03-09 16:32:18 +08:00 |
|
cherishsince
|
33d77b9b16
|
配置 yudao-dependencies spring-ai依赖
|
2024-03-03 20:19:06 +08:00 |
|
YunaiV
|
a390fb4519
|
✨ CRM：更新最新代码，支持线索、客户、联系人、商机、合同等功能
|
2024-02-26 12:55:58 +08:00 |
|
YunaiV
|
088fbb2096
|
Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk21
|
2024-02-26 12:25:55 +08:00 |
|
YunaiV
|
9ea7bde751
|
📖 ERP：增加 ERP 首页的统计
|
2024-02-18 19:05:40 +08:00 |
|
YunaiV
|
20f8cb1606
|
✨ 2.0.1 版本发布准备
|
2024-02-17 21:01:59 +08:00 |
|
YunaiV
|
94153cb59e
|
✨ 增加 ERP 系统的介绍
|
2024-02-17 10:10:09 +08:00 |
|
YunaiV
|
e9a29e6dd4
|
CRM：优化合同金额排行、回款金额排行
|
2024-02-03 01:14:35 +08:00 |
|
安浩浩
|
46e01e07a8
|
修改：CRM 商业智能，合并模块到 crm，优化查询
|
2024-01-31 23:35:27 +08:00 |
|
anhaohao
|
fdd5d55fc8
|
Merge remote-tracking branch 'origin/develop' into develop
|
2024-01-28 20:11:00 +08:00 |
|
anhaohao
|
65d7f8c4ab
|
新增：CRM 商业智能，合同金额排行榜和回款金额排行榜
|
2024-01-28 20:06:56 +08:00 |
|
YunaiV
|
ebd9222764
|
✨ ERP：初始化模块，立个 2024 年的 flag
|
2024-01-27 17:25:07 +08:00 |
|
YunaiV
|
5b69df074c
|
✨ 全局：将 banner、error-code、desensitize 融合到 web 组件里，减少 starter
|
2024-01-27 10:25:25 +08:00 |
|
YunaiV
|
f4a55d3e26
|
🙂 同步 develop 最新开发代码
|
2024-01-19 09:10:26 +08:00 |
|
YunaiV
|
23df8633f4
|
📖 CRM：code review 数据权限的实现
|
2023-12-09 10:50:47 +08:00 |
|
puhui999
|
5c395fc1c4
|
CRM: 完善 code review 数据权限提到的问题，重新封装 CrmQueryWrapperUtils
|
2023-12-08 15:27:58 +08:00 |
|
YunaiV
|
a9ae7b0865
|
✅ 完善 UReport2 的集成
|
2023-12-07 07:37:32 +08:00 |
|
YunaiV
|
076bf13687
|
📈 REPORT：code review ureport2 实现
|
2023-12-06 21:02:26 +08:00 |
|
YunaiV
|
9451287264
|
✨ CRM：同步最新功能，基本跑通客户信息的维护
|
2023-12-06 20:28:53 +08:00 |
|
YunaiV
|
c94f71a3df
|
🔨 CRM：优化产品分类代码的实现
|
2023-12-06 12:56:35 +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
|
6270975902
|
优化启动速度
|
2023-11-19 00:37:30 +08:00 |
|
YunaiV
|
989d7c44d0
|
code review 店铺装修
|
2023-11-04 22:52:41 +08:00 |
|
YunaiV
|
0657c357bf
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/crm
|
2023-10-29 14:25:38 +08:00 |
|
YunaiV
|
c11300d33a
|
解决启动问题
|
2023-10-24 19:54:49 +08:00 |