Commit Graph

372 Commits (f8d55d7c0a4ad36143f7e8a8acd8b58ae71722a7)

Author SHA1 Message Date
haha 060632dd82 在系统管理添加用户的时候输入完用户名和手机号点查询,会弹出提示框未找到数据,然后数据被清空了,不应该被清空 2025-04-01 23:50:37 +08:00
haha af47403143 Merge remote-tracking branch 'origin/dev_xd' into dev_xd 2025-04-01 22:33:52 +08:00
haha 3d260f7134 修改大屏考勤人员对话框 2025-04-01 00:14:12 +08:00
haha 40cf397199 Merge remote-tracking branch 'origin/dev_xd' into dev_xd 2025-03-31 23:51:57 +08:00
haha b34bf8bb9e 修改大屏项目详情信息 2025-03-31 23:51:54 +08:00
姜玉琦 6d5be9402c 提交代码 2025-03-31 22:36:03 +08:00
姜玉琦 dd32355b98 Merge branch 'dev_xd' of http://62.234.3.186:3000/jiangyq/YZProjectCloud into dev_xd 2025-03-30 22:04:23 +08:00
姜玉琦 5a580280a7 提交代码 2025-03-30 22:04:15 +08:00
haha 3cdb0d62da 修复塔机大屏 2025-03-26 22:53:46 +08:00
姜玉琦 6443a6e929 提交ok 2025-03-23 00:26:48 +08:00
姜玉琦 871964321d Merge branch 'dev_xd' of http://62.234.3.186:3000/jiangyq/YZProjectCloud into dev_xd 2025-03-23 00:15:44 +08:00
姜玉琦 3699296e63 提交代码 2025-03-23 00:15:33 +08:00
haha d27ddfe2f8 塔基大屏 2025-03-22 19:04:33 +08:00
姜玉琦 425eca74a2 Merge branch 'dev_xd' of http://62.234.3.186:3000/jiangyq/YZProjectCloud into dev_xd 2025-03-22 18:49:09 +08:00
姜玉琦 8add9bb887 提交代码 2025-03-22 18:49:00 +08:00
haha c372d4a8dd 塔机大屏后台 2025-03-20 23:15:22 +08:00
haha 3bfbc3d61f 塔机碰撞信息 2025-03-20 22:50:40 +08:00
haha ff7b80ddbf 塔机工作循环功能 2025-03-20 22:07:00 +08:00
haha d00f1c5363 塔机工作循环 2025-03-20 21:50:07 +08:00
姜玉琦 81b0a5244e 提交代码 2025-03-20 10:44:27 +08:00
姜玉琦 0c4a9f260d Merge branch 'dev_xd' of http://62.234.3.186:3000/jiangyq/YZProjectCloud into dev_xd 2025-03-20 00:53:35 +08:00
姜玉琦 e2dd163efc 提交代码 2025-03-20 00:53:20 +08:00
haha 5880a4c36b 塔吊监测API 2025-03-19 23:26:27 +08:00
haha c9432db452 塔机实时数据 2025-03-19 23:10:37 +08:00
haha 04213e6d91 塔基检测配置开发 2025-03-19 21:59:22 +08:00
haha 002abc4774 塔基后台 2025-03-16 23:29:04 +08:00
haha b22316d993 安全隐患大屏 2025-03-16 21:47:17 +08:00
haha cf6b67bf5a 安全隐患大屏 2025-03-15 00:12:16 +08:00
姜玉琦 4db7c1f325 意见 2025-03-14 00:53:30 +08:00
姜玉琦 ac0c401534 Merge branch 'dev_xd' of http://62.234.3.186:3000/jiangyq/YZProjectCloud into dev_xd 2025-03-14 00:15:25 +08:00
姜玉琦 b26778ca05 提交 2025-03-14 00:15:16 +08:00
haha cad9b21562 安全隐患大屏 2025-03-14 00:06:46 +08:00
姜玉琦 c0dbc27d5f 提交代码 2025-03-11 17:03:26 +08:00
姜玉琦 d2b8ce4b2c 提交代码 2025-03-10 00:01:08 +08:00
姜玉琦 e5653b4c56 提交 2025-03-09 21:17:00 +08:00
姜玉琦 10f6cad6cb 提交代码 2025-03-09 15:43:29 +08:00
姜玉琦 a9d0d7ad46 提交代码 2025-03-09 15:20:46 +08:00
姜玉琦 75953e6c1f 提交代码 2025-03-09 15:12:11 +08:00
姜玉琦 d5797bdb89 提交代码 2025-03-08 17:00:57 +08:00
姜玉琦 c968a009b3 提交代码 2025-03-08 16:54:27 +08:00
姜玉琦 f598a52789 提交代码 2025-03-08 16:25:28 +08:00
姜玉琦 4635d42aa4 Merge branch 'dev_xd' of http://62.234.3.186:3000/jiangyq/YZProjectCloud into dev_xd
# Conflicts:
#	yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/SmzSspProblemmodifyController.java
#	yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/ISmzSspProblemmodifyService.java
2025-03-08 16:18:15 +08:00
姜玉琦 bb93a26ed0 提交代码 2025-03-08 16:14:09 +08:00
lj7788@126.com dea174ab73 安全隐患大屏后台 2025-03-08 15:39:41 +08:00
姜玉琦 898e4a5dd4 提交代码 2025-03-08 02:03:38 +08:00
姜玉琦 082acc5ce8 提交代码 2025-03-08 02:01:13 +08:00
姜玉琦 e31a2e2c91 提交dm 2025-03-06 23:05:45 +08:00
姜玉琦 20986f1a1f 提交代碼 2025-03-06 22:36:43 +08:00
姜玉琦 0b340003f3 提交代码 2025-03-05 23:45:45 +08:00
姜玉琦 f3735dbced Merge branch 'dev_xd' of http://62.234.3.186:3000/jiangyq/YZProjectCloud into dev_xd 2025-03-05 23:22:27 +08:00