diff --git a/插件库/Lskj.Control/Model/GridColumnModel.cs b/插件库/Lskj.Control/Model/GridColumnModel.cs
index f72aa2e..805157d 100644
--- a/插件库/Lskj.Control/Model/GridColumnModel.cs
+++ b/插件库/Lskj.Control/Model/GridColumnModel.cs
@@ -367,6 +367,10 @@ namespace Lskj.Control.Model
/// 禁止粘贴
///
public bool ProhibitPaste;
+ ///
+ /// 新版模块返回框类型,显示对应text值(默认只显示数据库中对应内容)
+ ///
+ public bool ModuleFrameDisplayText;
#endregion
///
@@ -457,4 +461,6 @@ namespace Lskj.Control.Model
}
this.IsCustomGroupPrimary = item.Table.Columns.Contains("IsCustomGroupPrimary") ? "1".Equals(item["IsCustomGroupPrimary"] + "") : false;
this.IsCustomGroupField = item.Table.Columns.Contains("IsCustomGroupField")&&int.TryParse(item["IsCustomGroupField"] + "",out IsCustomGroupField) ? IsCustomGroupField : 0;
- this.ImportConversionFormat = item.Table.Columns.Contains("ImportConversionFormat") ? item["ImportConversionFormat
\ No newline at end of file
+ this.ImportConversionFormat = item.Table.Columns.Contains("ImportConversionFormat") ? item["ImportConversionFormat"]+"" : string.Empty;
+ this.PrivilegeView = item.Table.Columns.Contains("PrivilegeView") ? item["PrivilegeView"] + "" : string.Empty;
+ this.PrivilegeOper = item.Table.Columns
\ No newline at end of file