Commit Graph

1906 Commits

Author SHA1 Message Date
liang.chao eb09e27ab5 Merge remote-tracking branch 'origin/dev-nx' into dev-nx 2024-08-26 20:25:45 +08:00
liang.chao 6de2c8b5c3 大屏二级页面接口增加 2024-08-26 20:25:38 +08:00
BianLzhaoMin baef8909bf Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx 2024-08-23 08:54:58 +08:00
BianLzhaoMin b62d692d3e 代码优化 2024-08-23 08:54:51 +08:00
liang.chao 0bfae9191a iot设备code字符问题修改 2024-08-22 11:04:07 +08:00
liang.chao 4f2454d7dd iot设备code字符问题修改 2024-08-22 11:01:08 +08:00
liang.chao 52f40b3acd 角色表查询sql修改 2024-08-21 16:46:40 +08:00
liang.chao 82cd7e1cca 本地配置文件修改 2024-08-21 14:34:05 +08:00
liang.chao 4d3673b337 Merge remote-tracking branch 'origin/dev-nx' into dev-nx 2024-08-21 14:14:25 +08:00
liang.chao 5311cb0c5c Merge branch 'macode20240820' into dev-nx 2024-08-21 14:13:58 +08:00
sxu 5aa904aa95 remark 2 scripts 2024-08-21 14:11:30 +08:00
sxu f9488d54fd 合并profile改动 2024-08-21 14:01:52 +08:00
liang.chao 0a01e46d18 machine库存查询修改 2024-08-21 11:20:27 +08:00
sxu 25b4cad47e 合并重复提交改动 2024-08-21 11:09:06 +08:00
liang.chao 2edf5af00b machine库存查询修改 2024-08-20 14:09:48 +08:00
sxu a0affba5ae 防重复提交 2024-08-19 18:55:50 +08:00
liang.chao 8638358fa1 大屏定位信息代码提交 2024-08-19 17:59:40 +08:00
liang.chao 90210e0ac4 大屏定位信息代码提交 2024-08-19 17:49:56 +08:00
BianLzhaoMin d6434ff805 代码优化 2024-08-16 13:37:50 +08:00
BianLzhaoMin f3312f4970 结算金额处略微调整 2024-08-15 09:34:06 +08:00
BianLzhaoMin 2ed34bec99 费用结算页面优化 2024-08-14 17:07:38 +08:00
BianLzhaoMin 6d7a3e9f10 结算页面费用调整 2024-08-14 15:10:35 +08:00
BianLzhaoMin 13ca08d4a3 结算费用模块调整 2024-08-14 14:52:39 +08:00
BianLzhaoMin f97b175f57 Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx 2024-08-13 18:11:12 +08:00
BianLzhaoMin 31e9acfbbf 页面优化 2024-08-13 18:11:07 +08:00
liang.chao fbf124d1d4 标段工程修改增加字段 2024-08-13 18:09:17 +08:00
liang.chao 738f842a30 禅道bug修改,周计划任务提交 2024-08-13 17:45:27 +08:00
BianLzhaoMin 1a1ad07c53 iot定位设备页面优化 2024-08-13 15:35:26 +08:00
sxu fe500aee26 deploy 2024-08-13 08:41:34 +08:00
sxu 825c4abb8b nx2.0 2024-08-12 11:27:27 +08:00
76164 0bf660faf3 IOT设备 2024-08-12 10:52:51 +08:00
76164 04137f7203 Merge remote-tracking branch 'origin/dev-nx' into dev-nx 2024-08-09 17:11:42 +08:00
76164 0c15f6917e IOT设备 2024-08-09 17:11:19 +08:00
BianLzhaoMin a911f36d75 代码优化 2024-08-09 17:06:58 +08:00
BianLzhaoMin f62151ef83 代码优化 2024-08-09 17:05:07 +08:00
BianLzhaoMin 5bd0f38ff2 代码优化 2024-08-09 16:20:27 +08:00
BianLzhaoMin e41bc3419a 代码优化 2024-08-09 16:13:05 +08:00
BianLzhaoMin 40c6391e02 代码优化 2024-08-09 15:58:10 +08:00
BianLzhaoMin e9119baa7f Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx 2024-08-09 15:48:33 +08:00
BianLzhaoMin 71f97c334a iot页面代码优化 2024-08-09 15:48:27 +08:00
liang.chao 0af7c7cf0b Merge remote-tracking branch 'origin/dev-nx' into dev-nx 2024-08-09 15:30:29 +08:00
liang.chao aecc2ca7a7 维修配件数据更新 2024-08-09 15:30:17 +08:00
BianLzhaoMin 98d2553681 代码优化 2024-08-09 15:29:09 +08:00
BianLzhaoMin 10689a848f iot设备页面优化 2024-08-09 15:16:43 +08:00
BianLzhaoMin 70c87e41b1 代码合并 2024-08-09 15:07:10 +08:00
BianLzhaoMin bbce3dc6d9 增加时间格式化插件 2024-08-09 11:12:59 +08:00
BianLzhaoMin 55fe9d8e30 Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx 2024-08-09 10:16:02 +08:00
BianLzhaoMin 147fa95a7e 代码合并 2024-08-09 10:15:58 +08:00
BianLzhaoMin 060912bc19 代码合并 2024-08-09 10:12:50 +08:00
BianLzhaoMin 377c904af2 代码合并 2024-08-09 10:10:15 +08:00