~admin/昆仑_1025.git

240717班级，工业化控制系统，煤矿相关行业，昆仑系统

parent: 3ed51f1c | 补丁 | 提交 | ignore whitespace

Merge branch 'master' of ssh://115.28.86.8:29418/~admin/昆仑_1025

wangky

2024-11-07 c8af872869ae691722e0632bbcbbde5271850474

Merge branch 'master' of ssh://115.28.86.8:29418/~admin/昆仑_1025

12个文件已删除

	Client/朱航/code/kunlunclient/clientmainwindow.cpp	52 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Client/朱航/code/kunlunclient/clientmainwindow.h	34 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Client/朱航/code/kunlunclient/clientmainwindow.ui	60 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Client/朱航/code/kunlunclient/common.h	1062 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Client/朱航/code/kunlunclient/kunlunclient.pro	39 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Client/朱航/code/kunlunclient/kunlunclient.pro.user	806 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Client/朱航/code/kunlunclient/logquery.cpp	216 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Client/朱航/code/kunlunclient/logquery.h	49 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Client/朱航/code/kunlunclient/logquery.ui	209 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Client/朱航/code/kunlunclient/main.cpp	11 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Client/朱航/code/服务端/LogSearch.cpp	91 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Client/朱航/code/服务端/LogSearch.h	17 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 Client/朱航/code/kunlunclient/clientmainwindow.cpp

File was deleted

 Client/朱航/code/kunlunclient/clientmainwindow.h

File was deleted

 Client/朱航/code/kunlunclient/clientmainwindow.ui

File was deleted

 Client/朱航/code/kunlunclient/common.h

File was deleted

 Client/朱航/code/kunlunclient/kunlunclient.pro

File was deleted

 Client/朱航/code/kunlunclient/kunlunclient.pro.user

File was deleted

 Client/朱航/code/kunlunclient/logquery.cpp

File was deleted

 Client/朱航/code/kunlunclient/logquery.h

File was deleted

 Client/朱航/code/kunlunclient/logquery.ui

File was deleted

 Client/朱航/code/kunlunclient/main.cpp

File was deleted

 Client/朱航/code/服务端/LogSearch.cpp

File was deleted

 Client/朱航/code/服务端/LogSearch.h

File was deleted