nothing
ucTreeViTri
delete getDayByCoSo and getTangByDay
up date treeViTri
Merge remote-tracking branch 'origin/master'

Conflicts:
	QuanLyTaiSan/Entities/Dayy.cs
Merge remote-tracking branch 'origin/master' into winform_khanh
Merge branch 'master' of https://github.com/quocdunginfo/QuanLyTaiSan
newThietBi
update gui
up date treeViTri
newThietBi
update gui
update tree
app config
nothing
edit conflict
update ucQuanLyVitri
update treeLoaiTB
đã add và update được object
Thêm lớp ảo cho DataFilter