lxd/FlowPacs
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,480 Commits 2 Branches 0 Tags 165 MiB
7e47d2efbb
Commit Graph

422 Commits

Author SHA1 Message Date
YunaiV
c0722b3a19 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/db 
# Conflicts:
#	sql/mysql/ruoyi-vue-pro.sql
 2024-05-01 08:05:18 +08:00
dhb52
06dacb747b feat: Oracle数据 DDL 适配 2024-04-30 23:41:25 +08:00
dhb52
4f3aaa124c feat: 测试数据库docker-compose, postgres DDL初稿 2024-04-29 23:41:33 +08:00
YunaiV
cd5e6319d9 【增强】一键改包：支持 site、org 等包 2024-04-29 00:13:04 +08:00
YunaiV
fd832e23fd bugfix：非 json 请求（文件上传）时，token 过期时，错误读取 request body 问题 2024-04-22 23:31:50 +08:00
YunaiV
9a31613e5b 【移除】敏感词的管理，简化项目的复杂度 2024-04-22 19:53:01 +08:00
YunaiV
8093ef3b96 【移除】错误码的管理，简化项目的复杂度 2024-04-22 19:42:45 +08:00
YunaiV
62c6c4b9bd 同步 develop 最新代码 2024-04-12 19:17:49 +08:00
YunaiV
9cba258d8f Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk21 2024-04-12 19:14:56 +08:00
YunaiV
2e03dcba69 移除 resilience4j 组件 2024-04-10 20:57:44 +08:00
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
 2024-04-05 13:32:17 +08:00
YunaiV
beea186507 全局：增加 VO 数据翻译的支持 2024-04-01 12:42:27 +08:00
YunaiV
dcf6cc293e BPM：【移除】Ureport 的实现，因为和 Spring Boot 兼容性较差 2024-03-30 20:44:45 +08:00
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
 2024-03-30 11:54:27 +08:00
YunaiV
907f3a58ba Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop 
# Conflicts:
#	sql/mysql/ruoyi-vue-pro.sql
 2024-03-28 18:53:54 +08:00
puhui999
ce013a2562 CRM: 新增客户行业、来源、级别统计数据统计 2024-03-24 17:15:56 +08:00
YunaiV
cc27652f86 最新菜单 SQL 的同步 2024-03-24 10:43:37 +08:00
YunaiV
e5444c5d47 BPM：优化 convert 的逻辑 2024-03-20 21:32:01 +08:00
YunaiV
797fddfb3d BPM：新增 flowable expression 表达式，替代现有 BpmTaskAssignScript，更加灵活 2024-03-14 12:54:16 +08:00
YunaiV
8dcc12f215 CRM：code review 客户总量统计 2024-03-09 16:32:18 +08:00
YunaiV
31e8777a7b ✨ CRM：更新最新代码，支持线索、客户、联系人、商机、合同等功能 2024-02-26 13:09:51 +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
bfe3dc95fe ✨ ERP：增加供应商的实现 2024-02-06 17:59:44 +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
6a6e95fcb6 ✨ 对齐 BOOT 与 CLOUD 的代码 2024-01-19 22:13:55 +08:00
YunaiV
f4a55d3e26 🙂 同步 develop 最新开发代码 2024-01-19 09:10:26 +08:00
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
 2023-12-30 20:11:07 +08:00
YunaiV
078ead536b 🐛 REPORT：支持 SaaS 租户模式 2023-12-30 10:30:47 +08:00
YunaiV
5de6a8bd23 📖 code review：操作日志的实现 2023-12-25 21:40:16 +08:00
YunaiV
82a25474f6 Merge remote-tracking branch 'origin/develop' into develop 2023-12-25 08:43:38 +08:00
YunaiV
7542b6a78d ✨ Member：完善微信相关配置 2023-12-25 08:43:32 +08:00
puhui999
3e91ac73c4 CRM：完善数据分页查询条件构造 CrmQueryWrapperUtils 2023-12-19 10:29:41 +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
98697ee075 ⬆️ 2023-12-07 20:48:11 +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
liuhongfeng
0d3efe4f80 【优化】ureport2菜单，初始化数据，按照规范重新进行命名处理 2023-12-06 21:02:26 +08:00
YunaiV
5e9cbb9cad report：code review ureport 的集成 2023-12-06 21:02:26 +08:00
liuhongfeng
5894d2be01 【修改】ureport2 集成的SQL语句，并适配数据库存储方式 2023-12-06 21:02:26 +08:00
liuhongfeng
8507fa9172 【新增】ureport2 集成 2023-12-06 21:02:25 +08:00