From 570046df69aeffbffb3efe8ddecaf523ca492a46 Mon Sep 17 00:00:00 2001
From: zongzhibin <zongzhibin@weben-smart.com>
Date: 周二, 26 11月 2024 09:15:39 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/LA24030-LuLI_PackageLine
---
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsSystemConfig/WmsConfigPrint/Dto/WmsConfigPrintInput.cs | 29 +++++++++++++++++------------
1 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsSystemConfig/WmsConfigPrint/Dto/WmsConfigPrintInput.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsSystemConfig/WmsConfigPrint/Dto/WmsConfigPrintInput.cs
index ec7bdd9..db0223f 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsSystemConfig/WmsConfigPrint/Dto/WmsConfigPrintInput.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsSystemConfig/WmsConfigPrint/Dto/WmsConfigPrintInput.cs
@@ -31,7 +31,7 @@
/// <summary>
/// 鎵撳嵃鏈哄垪琛�
/// </summary>
- public virtual List<string> PrinterListList { get; set; }
+ public virtual string PrinterList { get; set; }
/// <summary>
/// 澶囨敞
@@ -39,19 +39,9 @@
public virtual string Remark { get; set; }
/// <summary>
- /// 鍒涘缓浜�
- /// </summary>
- public virtual string CreateUserName { get; set; }
-
- /// <summary>
/// 鍒涘缓鏃堕棿
/// </summary>
public virtual DateTime? CreateTime { get; set; }
-
- /// <summary>
- /// 淇敼浜�
- /// </summary>
- public virtual string UpdateUserName { get; set; }
/// <summary>
/// 淇敼鏃堕棿
@@ -64,9 +54,19 @@
public virtual long? CreateUserId { get; set; }
/// <summary>
+ /// 鍒涘缓浜�
+ /// </summary>
+ public virtual string CreateUserName { get; set; }
+
+ /// <summary>
/// 淇敼浜篒d
/// </summary>
public virtual long? UpdateUserId { get; set; }
+
+ /// <summary>
+ /// 淇敼浜�
+ /// </summary>
+ public virtual string UpdateUserName { get; set; }
/// <summary>
/// 杞垹闄�
@@ -128,6 +128,11 @@
[Required(ErrorMessage = "鎵撳嵃鍒嗙被涓嶈兘涓虹┖")]
public override Admin.NET.Application.PrintClassifyEnum PrintClassify { get; set; }
+ /// <summary>
+ /// 鎵撳嵃鍒嗙被鍚�
+ /// </summary>
+ [Required(ErrorMessage = "鎵撳嵃鍒嗙被鍚嶄笉鑳戒负绌�")]
+ public override string PrintClassifyName { get; set; }
/// <summary>
/// 鎵撳嵃妯℃澘鍚�
@@ -145,7 +150,7 @@
/// 鎵撳嵃鏈哄垪琛�
/// </summary>
[Required(ErrorMessage = "鎵撳嵃鏈哄垪琛ㄤ笉鑳戒负绌�")]
- public override List<string> PrinterListList { get; set; }
+ public override string PrinterList { get; set; }
/// <summary>
/// 杞垹闄�
--
Gitblit v1.9.3