Commit Graph

70 Commits

Author SHA1 Message Date
wanxiaoli
b8b122980f 设备、临界数据根据设备类型做导入 2025-12-25 09:16:29 +08:00
8c277528cb Merge branch 'develop-business-css' of http://121.37.111.42:3000/ThbTech/JavaProjectRepo into develop-business-css 2025-12-24 17:14:24 +08:00
88dcd945e6 前端修改idbug 2025-12-24 17:14:19 +08:00
wanxiaoli
c88aae3f48 分页 2025-12-24 17:12:39 +08:00
wanxiaoli
0c64c11b58 提交新修改 2025-12-24 16:40:13 +08:00
8262b7c054 Merge branch 'develop-business-css' of http://121.37.111.42:3000/ThbTech/JavaProjectRepo into develop-business-css 2025-12-24 16:36:20 +08:00
46a5554a8e 新增临界数据管理 2025-12-24 16:36:15 +08:00
wanxiaoli
6e5376836d Merge branch 'develop-business-css' of http://121.37.111.42:3000/ThbTech/JavaProjectRepo into development-business-css 2025-12-24 15:46:45 +08:00
wanxiaoli
02375f3b03 添加创建人 2025-12-24 15:46:21 +08:00
db11179d81 Merge branch 'develop-business-css' of http://121.37.111.42:3000/ThbTech/JavaProjectRepo into develop-business-css 2025-12-24 13:33:11 +08:00
5a920b96c1 添加物料模块 2025-12-24 13:33:05 +08:00
wanxiaoli
4d40414e82 Merge branch 'develop-business-css' of http://121.37.111.42:3000/ThbTech/JavaProjectRepo into development-business-css 2025-12-24 12:36:20 +08:00
wanxiaoli
7bb9d657f9 基础类修改 2025-12-24 12:35:13 +08:00
0adfdf748d Merge branch 'develop-business-css' of http://121.37.111.42:3000/ThbTech/JavaProjectRepo into develop-business-css 2025-12-23 14:54:03 +08:00
bad8cd11d5 添加项目模块 2025-12-23 14:53:57 +08:00
wanxiaoli
200222165a 代码更新 2025-12-23 14:42:05 +08:00
wanxiaoli
5fbdb08f67 添加创建人 2025-12-19 12:08:07 +08:00
wanxiaoli
7499a6e295 细化接口方法、注释等 2025-12-18 17:16:24 +08:00
wanxiaoli
719f02becd 修改 2025-12-17 17:52:12 +08:00
wanxiaoli
d6406f325a 提交功能规划文档 2025-12-17 17:43:50 +08:00
wanxiaoli
74a43d99a6 提交业务系统更新 2025-12-17 17:09:58 +08:00
wanxiaoli
17c177a341 增加了css项目业务类的增删改查方法 2025-12-17 17:08:51 +08:00
28810ecff3 添加了前端frontend代码 2025-11-21 13:06:11 +08:00
0f50e2ccd1 Merge remote-tracking branch 'origin/main-framework' into develop-business-css 2025-11-21 11:31:39 +08:00
aec6f41b25 Merge pull request 'develop-framework' (#8) from develop-framework into main-framework
Reviewed-on: #8
2025-11-21 10:29:51 +08:00
30642e95c0 修改了忽略文件 2025-11-21 10:24:05 +08:00
4b94be1b4a chore: stop tracking generated assets per .gitignore (static/ and business-css/target) 2025-11-21 10:18:55 +08:00
e8f1f576bf Merge framework directory from develop-business-css into develop-framework 2025-11-21 10:07:17 +08:00
507cc6a6d2 整理和前后端端代码及框架 2025-11-21 10:04:00 +08:00
f2e6cc67f3 测试提交 2025-11-20 16:42:09 +08:00
6fba87f156 Merge remote-tracking branch 'origin/main-framework' into develop-business-css 2025-11-12 18:15:45 +08:00
4bae2b7c03 修改了一个告警错误 2025-11-12 18:14:38 +08:00
3ae1e7b1f9 Merge pull request 'develop-framework' (#7) from develop-framework into main-framework
Reviewed-on: #7
2025-11-12 17:41:02 +08:00
3a8b721d7c fix:初始化代码 2025-11-10 11:41:42 +08:00
a79f0bd0d3 fix:修改sass运行警告问题 2025-11-10 10:59:46 +08:00
63d41e11a6 增加了分析模拟系统模块框架 2025-11-09 22:55:49 +08:00
48bca56d15 Merge remote-tracking branch 'origin/main-framework' into develop-business-css 2025-11-09 22:06:32 +08:00
0f23ed2024 Merge pull request 'develop-framework' (#6) from develop-framework into main-framework
Reviewed-on: #6
2025-11-09 22:05:32 +08:00
a80ddcd2eb Merge branch 'main-framework' into develop-framework 2025-11-09 22:00:34 +08:00
d962eadafc 更新了数据库连接frameworkdb2023 2025-11-09 21:57:40 +08:00
fc4d5fc2cd 增加了从main-framework分支同步脚本 2025-11-09 21:48:30 +08:00
16549de421 Merge branch 'main-framework' into develop-business-css 2025-11-09 21:43:52 +08:00
d790992125 Merge pull request '增加了数据库初始化脚本处理' (#4) from develop-framework into main-framework
Reviewed-on: #4
2025-11-09 20:43:08 +08:00
9397ba32b6 增加了数据库初始化脚本处理 2025-11-09 20:41:38 +08:00
a14bdfd804 Merge pull request 'docs:测试从开发分支合并到主分支' (#3) from develop-framework into main-framework
Reviewed-on: #3
2025-11-09 18:59:12 +08:00
64929f620c docs:测试提交 2025-11-09 18:51:58 +08:00
3079ca2a44 Merge pull request 'develop-framework' (#2) from develop-framework into main-framework
Reviewed-on: #2
2025-11-09 18:38:11 +08:00
6dee0c43e8 Merge branch 'main-framework' into develop-framework 2025-11-09 18:29:31 +08:00
1d93c13d62 Merge branch 'develop-framework' of http://121.37.111.42:3000/ThbTech/JavaProjectRepo into develop-framework 2025-11-09 16:34:18 +08:00
ProjectFrameWork2025
353324515a docs:修改了develop-framework 分支 Git 操作指南 2025-11-09 16:28:59 +08:00