diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplControllers.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplControllers.txt index 904e597..eb25c9d 100644 --- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplControllers.txt +++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplControllers.txt @@ -95,9 +95,9 @@ $if(replaceDto.ShowBtnAdd) throw new CustomException("请求参数错误"); } //从 Dto 映射到 实体 - var model = parm.Adapt<${replaceDto.ModelTypeName}>().ToCreate(HttpContext); + var modal = parm.Adapt<${replaceDto.ModelTypeName}>().ToCreate(HttpContext); - var response = _${replaceDto.ModelTypeName}Service.Insert(model, it => new + var response = _${replaceDto.ModelTypeName}Service.Insert(modal, it => new { $foreach(item in genTable.Columns) $if((item.IsInsert)) @@ -124,14 +124,14 @@ $if(replaceDto.ShowBtnEdit) throw new CustomException("请求实体不能为空"); } //从 Dto 映射到 实体 - var model = parm.Adapt<${replaceDto.ModelTypeName}>().ToUpdate(HttpContext); + var modal = parm.Adapt<${replaceDto.ModelTypeName}>().ToUpdate(HttpContext); - var response = _${replaceDto.ModelTypeName}Service.Update(w => w.${replaceDto.PKName} == model.${replaceDto.PKName}, it => new ${replaceDto.ModelTypeName}() + var response = _${replaceDto.ModelTypeName}Service.Update(w => w.${replaceDto.PKName} == modal.${replaceDto.PKName}, it => new ${replaceDto.ModelTypeName}() { //Update 字段映射 $foreach(item in genTable.Columns) $if((item.IsEdit)) - $item.CsharpField = model.$item.CsharpField, + $item.CsharpField = modal.$item.CsharpField, $end ${end} }); diff --git a/ZR.Vue/src/main.js b/ZR.Vue/src/main.js index 633ae62..6b2b1fd 100644 --- a/ZR.Vue/src/main.js +++ b/ZR.Vue/src/main.js @@ -16,7 +16,7 @@ import signalR from '@/utils/signalR' import './assets/icons' // icon import './permission' // permission control -import { getDicts} from "@/api/system/dict/data"; +import { getDicts } from "@/api/system/dict/data"; import { getConfigKey } from "@/api/system/config"; import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, download, handleTree, handleDict } from "@/utils/ruoyi"; //分页组件