Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev

2023-04-26 10:56:07 +08:00
parent cb86df09e0 5d6e9265a8
commit 4bfceebed8
13 changed files with 23 additions and 54 deletions
--- a/ProductionMgr/Tnb.ProductionMgr.Entitys/Dto/PrdManage/EquipmentListOutput.cs
+++ b/ProductionMgr/Tnb.ProductionMgr.Entitys/Dto/PrdManage/EquipmentListOutput.cs
@@ -10,7 +10,7 @@ namespace Tnb.ProductionMgr.Entitys.Dto
    /// <summary>
    /// 设备列表输出参数
    /// </summary>
-    public class EquipmentListOutput : EqpEquipment
+    public class EquipmentListOutput //: EqpEquipment 不能直接继承实体类
    {
        /// <summary>
        /// 任务单数量