merge from 2023-03-14

This commit is contained in:
2023-03-24 09:37:07 +08:00
parent f95ef4cf73
commit 3de92dab06
57 changed files with 1538 additions and 528 deletions

View File

@@ -22,14 +22,14 @@ public static class CodeGenHelper
case "nchar":
case "timestamp":
case "string":
return "string";
return "string?";
case "int":
case "smallint":
return "int";
return "int?";
case "tinyint":
return "byte";
return "byte?";
case "bigint":
// sqlite数据库
@@ -43,10 +43,10 @@ public static class CodeGenHelper
case "smallmoney":
case "numeric":
case "decimal":
return "decimal";
return "decimal?";
case "real":
return "Single";
return "Single?";
case "datetime":
case "datetime2":
@@ -55,7 +55,7 @@ public static class CodeGenHelper
return "DateTime?";
case "float":
return "double";
return "double?";
case "image":
case "binary":
@@ -218,7 +218,7 @@ public static class CodeGenHelper
result.Add(label, "系统自动生成");
break;
case JnpfKeyConst.COMSELECT:
result.Add(label, multiple ? "例:拓通智联/产品部,拓通智联/技术部" : "例:拓通智联/技术部");
result.Add(label, multiple ? "例:引迈信息/产品部,引迈信息/技术部" : "例:引迈信息/技术部");
break;
case JnpfKeyConst.DEPSELECT:
result.Add(label, multiple ? "例:产品部/部门编码,技术部/部门编码" : "例:技术部/部门编码");
@@ -230,7 +230,7 @@ public static class CodeGenHelper
result.Add(label, multiple ? "例:张三/账号,李四/账号" : "例:张三/账号");
break;
case JnpfKeyConst.USERSSELECT:
result.Add(label, multiple ? "例:拓通智联/产品部,产品部/部门编码,技术经理/岗位编码,研发人员/角色编码,A分组/分组编码,张三/账号" : "例:李四/账号");
result.Add(label, multiple ? "例:引迈信息/产品部,产品部/部门编码,技术经理/岗位编码,研发人员/角色编码,A分组/分组编码,张三/账号" : "例:李四/账号");
break;
case JnpfKeyConst.ROLESELECT:
result.Add(label, multiple ? "例:研发人员/角色编码,测试人员/角色编码" : "例:研发人员/角色编码");