diff --git a/ZR.CodeGenerator/CodeGenerateTemplate.cs b/ZR.CodeGenerator/CodeGenerateTemplate.cs
index 528df2d..be38068 100644
--- a/ZR.CodeGenerator/CodeGenerateTemplate.cs
+++ b/ZR.CodeGenerator/CodeGenerateTemplate.cs
@@ -194,7 +194,7 @@ namespace ZR.CodeGenerator
if (dbFieldInfo.HtmlType == GenConstants.HTML_DATETIME)
{
sb.AppendLine(" ");
- sb.AppendLine(" ");
+ sb.AppendLine(" ");
sb.AppendLine(" ");
}
else
diff --git a/ZR.CodeGenerator/CodeGeneratorTool.cs b/ZR.CodeGenerator/CodeGeneratorTool.cs
index 6e164b8..497215d 100644
--- a/ZR.CodeGenerator/CodeGeneratorTool.cs
+++ b/ZR.CodeGenerator/CodeGeneratorTool.cs
@@ -201,7 +201,7 @@ namespace ZR.CodeGenerator
.Replace("{Author}", replaceDto.Author)
.Replace("{DateTime}", replaceDto.AddTime);
- //generateDto.GenCodes.Add(new GenCode(2, "数据传输实体类", fullPath, content));
+ generateDto.GenCodes.Add(new GenCode(2, "数据传输实体类", fullPath, content));
}
#endregion
@@ -255,7 +255,7 @@ namespace ZR.CodeGenerator
.Replace("{Author}", replaceDto.Author)
.Replace("{DateTime}", replaceDto.AddTime);
- //generateDto.GenCodes.Add(new GenCode(4, "接口层", fullPath, content));
+ generateDto.GenCodes.Add(new GenCode(4, "接口层", fullPath, content));
}
///
diff --git a/ZR.Vue/src/api/gendemo.js b/ZR.Vue/src/api/gendemo.js
index 7fd0c43..234d94f 100644
--- a/ZR.Vue/src/api/gendemo.js
+++ b/ZR.Vue/src/api/gendemo.js
@@ -1,7 +1,7 @@
import request from '@/utils/request'
/**
- * 代码生成测试表分页查询
+ * 代码生成测试分页查询
* @param {查询条件} data
*/
export function listGendemo(query) {
@@ -13,7 +13,7 @@ export function listGendemo(query) {
}
/**
- * 新增代码生成测试表
+ * 新增代码生成测试
* @param data
*/
export function addGendemo(data) {
@@ -25,7 +25,7 @@ export function addGendemo(data) {
}
/**
- * 修改代码生成测试表
+ * 修改代码生成测试
* @param data
*/
export function updateGendemo(data) {
@@ -37,8 +37,8 @@ export function updateGendemo(data) {
}
/**
- * 获取代码生成测试表详情
- * @param {Id} 代码生成测试表Id
+ * 获取代码生成测试详情
+ * @param {Id} {ModelTypeDesc}Id
*/
export function getGendemo(id) {
return request({
diff --git a/ZR.Vue/src/views/tool/gen/index.vue b/ZR.Vue/src/views/tool/gen/index.vue
index f0cd9bc..77f0796 100644
--- a/ZR.Vue/src/views/tool/gen/index.vue
+++ b/ZR.Vue/src/views/tool/gen/index.vue
@@ -19,7 +19,7 @@
删除
-
+
@@ -45,7 +45,7 @@
-
+
@@ -115,7 +115,7 @@ export default {
open: false,
title: "代码预览",
data: {},
- activeName: "1",
+ activeName: "0",
},
showGenerate: false,
checkedCodeGenerateForm: [1, 2, 3, 4, 5, 6, 7, 8],
@@ -199,10 +199,10 @@ export default {
var seachdata = {
tableId: this.currentSelected.tableId,
tableName: this.currentSelected.name,
- genFiles: this.checkedCodeGenerateForm,
+ genCodeFiles: this.checkedCodeGenerateForm,
coverd: this.coverd,
dbType: this.dbType,
- queryColumn: this.checkedQueryColumn,
+ // queryColumn: this.checkedQueryColumn,
};
console.log(JSON.stringify(seachdata));
diff --git a/ZRAdmin.xml b/ZRAdmin.xml
index 6a4d9d8..60d2124 100644
--- a/ZRAdmin.xml
+++ b/ZRAdmin.xml
@@ -27,44 +27,47 @@
-
+
+
+ 代码生成测试Controller
+
+ @author ruirui
+ @date 2021-09-24
+
+
+
- 代码自动生成
+ 代码生成测试接口
-
+
- 用户信息接口
-
-
-
-
- 查询用户信息列表
+ 查询代码生成测试列表
-
+
- 查询用户信息详情
+ 查询代码生成测试详情
-
+
-
+
- 添加用户信息
+ 添加代码生成测试
-
+
- 更新用户信息
+ 更新代码生成测试
-
+
- 删除用户信息
+ 删除代码生成测试
diff --git a/document/images/11.png b/document/images/11.png
index 3a36643..08ea386 100644
Binary files a/document/images/11.png and b/document/images/11.png differ
diff --git a/document/images/12.png b/document/images/12.png
index 2625491..88a55c0 100644
Binary files a/document/images/12.png and b/document/images/12.png differ
diff --git a/document/images/17.png b/document/images/17.png
new file mode 100644
index 0000000..3d416e6
Binary files /dev/null and b/document/images/17.png differ