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

EquipMgr/Tnb.EquipMgr.Entities/Dto/PadMainListOutput.cs

@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Numerics;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tnb.EquipMgr.Entities.Dto
+{
+    public class PadMainListOutput
+    {
+        public string plan_id { get; set; }
+        public string mold_id { get; set; }
+
+        public string mold_code { get; set; }
+
+        public string mold_name { get; set; }
+
+        public string mold_status { get; set; }
+        public string status { get; set; }
+        public string createuser { get; set; }
+        public string createtime { get; set; }
+        public string plan_start_time { get; set; }
+        public string starttime { get; set; }
+
+    }
+}

EquipMgr/Tnb.EquipMgr.Entities/Dto/PdaMaintainInput.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using JNPF.Common.Filter;
+
+namespace Tnb.EquipMgr.Entities.Dto
+{
+    public class PdaMaintainInput : PageInputBase
+    {
+        public string status { get; set; }
+
+        public string maintain_info { get; set; }
+
+        public DateTime? start_time { get; set; }
+        public DateTime? end_time { get; set; }
+
+    }
+}