YunaiV
|
9b9f54bb03
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop
# Conflicts:
# yudao-dependencies/pom.xml
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/CrmCustomerController.java
# yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseOrderController.java
|
2 years ago |
|
YunaiV
|
beea186507
|
全局：增加 VO 数据翻译的支持
|
2 years ago |
|
YunaiV
|
dcf6cc293e
|
BPM：【移除】Ureport 的实现，因为和 Spring Boot 兼容性较差
|
2 years ago |
|
YunaiV
|
3b379d8cc0
|
Merge branch 'develop' of https://gitee.com/puhui999/ruoyi-vue-pro into develop
# Conflicts:
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/statistics/CrmStatisticsCustomerController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/statistics/CrmStatisticsCustomerServiceImpl.java
|
2 years ago |
|
YunaiV
|
907f3a58ba
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop
# Conflicts:
# sql/mysql/ruoyi-vue-pro.sql
|
2 years ago |
puhui999
|
ce013a2562
|
CRM: 新增客户行业、来源、级别统计数据统计
|
2 years ago |
|
YunaiV
|
cc27652f86
|
最新菜单 SQL 的同步
|
2 years ago |
|
YunaiV
|
e5444c5d47
|
BPM：优化 convert 的逻辑
|
2 years ago |
|
YunaiV
|
797fddfb3d
|
BPM：新增 flowable expression 表达式，替代现有 BpmTaskAssignScript，更加灵活
|
2 years ago |
|
YunaiV
|
8dcc12f215
|
CRM：code review 客户总量统计
|
2 years ago |
|
YunaiV
|
31e8777a7b
|
✨ CRM：更新最新代码，支持线索、客户、联系人、商机、合同等功能
|
2 years ago |
|
YunaiV
|
a390fb4519
|
✨ CRM：更新最新代码，支持线索、客户、联系人、商机、合同等功能
|
2 years ago |
|
YunaiV
|
088fbb2096
|
Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk21
|
2 years ago |
|
YunaiV
|
9ea7bde751
|
📖 ERP：增加 ERP 首页的统计
|
2 years ago |
|
YunaiV
|
20f8cb1606
|
✨ 2.0.1 版本发布准备
|
2 years ago |
|
YunaiV
|
94153cb59e
|
✨ 增加 ERP 系统的介绍
|
2 years ago |
|
YunaiV
|
bfe3dc95fe
|
✨ ERP：增加供应商的实现
|
2 years ago |
|
YunaiV
|
e9a29e6dd4
|
CRM：优化合同金额排行、回款金额排行
|
2 years ago |
安浩浩
|
46e01e07a8
|
修改：CRM 商业智能，合并模块到 crm，优化查询
|
2 years ago |
|
anhaohao
|
fdd5d55fc8
|
Merge remote-tracking branch 'origin/develop' into develop
|
2 years ago |
|
anhaohao
|
65d7f8c4ab
|
新增：CRM 商业智能，合同金额排行榜和回款金额排行榜
|
2 years ago |
|
YunaiV
|
ebd9222764
|
✨ ERP：初始化模块，立个 2024 年的 flag
|
2 years ago |
|
YunaiV
|
5b69df074c
|
✨ 全局：将 banner、error-code、desensitize 融合到 web 组件里，减少 starter
|
2 years ago |
|
YunaiV
|
6a6e95fcb6
|
✨ 对齐 BOOT 与 CLOUD 的代码
|
2 years ago |
|
YunaiV
|
f4a55d3e26
|
🙂 同步 develop 最新开发代码
|
2 years ago |
|
YunaiV
|
290f45dd6e
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop
# Conflicts:
# yudao-server/src/main/resources/application-local.yaml
|
2 years ago |
|
YunaiV
|
078ead536b
|
🐛 REPORT：支持 SaaS 租户模式
|
2 years ago |
|
YunaiV
|
5de6a8bd23
|
📖 code review：操作日志的实现
|
2 years ago |
|
YunaiV
|
82a25474f6
|
Merge remote-tracking branch 'origin/develop' into develop
|
2 years ago |
|
YunaiV
|
7542b6a78d
|
✨ Member：完善微信相关配置
|
2 years ago |
|
puhui999
|
3e91ac73c4
|
CRM：完善数据分页查询条件构造 CrmQueryWrapperUtils
|
2 years ago |
|
YunaiV
|
23df8633f4
|
📖 CRM：code review 数据权限的实现
|
2 years ago |
|
puhui999
|
5c395fc1c4
|
CRM: 完善 code review 数据权限提到的问题，重新封装 CrmQueryWrapperUtils
|
2 years ago |
|
YunaiV
|
98697ee075
|
⬆️
|
2 years ago |
|
YunaiV
|
a9ae7b0865
|
✅ 完善 UReport2 的集成
|
2 years ago |
|
YunaiV
|
076bf13687
|
📈 REPORT：code review ureport2 实现
|
2 years ago |
liuhongfeng
|
0d3efe4f80
|
【优化】ureport2菜单，初始化数据，按照规范重新进行命名处理
|
2 years ago |
|
YunaiV
|
5e9cbb9cad
|
report：code review ureport 的集成
|
2 years ago |
|
liuhongfeng
|
5894d2be01
|
【修改】ureport2 集成的SQL语句，并适配数据库存储方式
|
2 years ago |
|
liuhongfeng
|
8507fa9172
|
【新增】ureport2 集成
|
2 years ago |
|
YunaiV
|
9451287264
|
✨ CRM：同步最新功能，基本跑通客户信息的维护
|
2 years ago |
|
YunaiV
|
c94f71a3df
|
🔨 CRM：优化产品分类代码的实现
|
2 years ago |
|
芋道源码
|
7724d6e830
|
!765 Vue2 + Element UI 代码生成器
Merge pull request !765 from 芋道源码/feature/sub-table
|
2 years ago |
|
puhui999
|
6d228828f4
|
application-local.yaml 恢复
|
2 years ago |
|
YunaiV
|
0233b092b8
|
websocket：重新封装 websocket 组件，支持 sender 广播
|
2 years ago |
|
YunaiV
|
1941a7b3e6
|
websocket：重新封装 websocket 组件，支持 token 认证，并增加 WebSocketMessageListener 方便处理消息
|
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
|
6270975902
|
优化启动速度
|
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 |