Merge branch 'master' of http://222.71.245.114:9086/r/iWare_RawMaterialWare...

payne

2024-04-25 75c4ec6f18f5ae2db91a22b034ecbadf25a7880c

 iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/System/CodeGen/CodeGenConfigService.cs

@@ -159,7 +159,7 @@
                codeGenConfig.WhetherTable = YesOrNo;
                codeGenConfig.WhetherOrderBy = YesOrNo;
                //是否联合主键 update by liuwq 20240418 
                codeGenConfig.WhetherRequired = YesOrNot.N.ToString();
                codeGenConfig.WhetherUnionKey = YesOrNot.N.ToString();
                codeGenConfig.ColumnKey = tableColumn.ColumnKey;

                codeGenConfig.DataType = tableColumn.DataType;