java/smart_screen.git

智慧建筑大屏

Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/smart_sc...

liujie

2026-01-30 bad0eff27a0352b8a45f0f3ecb2a5e635bc1af11

refs
用户	liujie <1793218484@qq.com>
	星期五, 一月 30, 2026 15:35 +0800
提交者	liujie <1793218484@qq.com>
	星期五, 一月 30, 2026 15:35 +0800
提交	bad0eff27a0352b8a45f0f3ecb2a5e635bc1af11
目录	a54f6d9057671dd4649e02ce3b111b6a434b7b35 目录 \| zip \| gz
parent	bbf1d06e48599b698be82761de193a6bd31f54cb 查看 \| 对比 7aaad6ba3f1ac7f9d7e431e103884364f811032d 查看 \| 对比

Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/smart_screen

# Conflicts:
#	ruoyi-system/src/main/resources/mapper/system/DeviceUsageMapper.xml

3个文件已修改

	ruoyi-system/src/main/java/com/ruoyi/system/query/ErrorListQuery.java	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DeviceUsageServiceImpl.java	194 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-system/src/main/resources/mapper/system/DeviceUsageMapper.xml	77 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史