Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairApply.cs

EquipMgr/Tnb.EquipMgr.Interfaces/IToolMoldMaintainPlanService.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tnb.EquipMgr.Interfaces
+{
+    public interface IToolMoldMaintainPlanService
+    {
+    }
+}