diff --git a/eladmin/eladmin-generator/src/main/resources/template/admin/Controller.ftl b/eladmin/eladmin-generator/src/main/resources/template/admin/Controller.ftl
index 179ea9d..6ef6d15 100644
--- a/eladmin/eladmin-generator/src/main/resources/template/admin/Controller.ftl
+++ b/eladmin/eladmin-generator/src/main/resources/template/admin/Controller.ftl
@@ -38,13 +38,12 @@ import me.zhengjie.utils.PageResult;
 **/
 @RestController
 @RequiredArgsConstructor
-@Api(tags = "${apiAlias}管理")
+@Api(tags = "${apiAlias}")
 @RequestMapping("/api/${changeClassName}")
 public class ${className}Controller {
 
     private final ${className}Service ${changeClassName}Service;
 
-    @Log("导出数据")
     @ApiOperation("导出数据")
     @GetMapping(value = "/download")
     @PreAuthorize("@el.check('${changeClassName}:list')")
@@ -53,7 +52,6 @@ public class ${className}Controller {
     }
 
     @GetMapping
-    @Log("查询${apiAlias}")
     @ApiOperation("查询${apiAlias}")
     @PreAuthorize("@el.check('${changeClassName}:list')")
     public ResponseEntity<PageResult<${className}>> query${className}(${className}QueryCriteria criteria, Page<Object> page){
@@ -82,7 +80,7 @@ public class ${className}Controller {
     @Log("删除${apiAlias}")
     @ApiOperation("删除${apiAlias}")
     @PreAuthorize("@el.check('${changeClassName}:del')")
-    public ResponseEntity<Object> delete${className}(@RequestBody List<${pkColumnType}> ids) {
+    public ResponseEntity<Object> delete${className}(@ApiParam(value = "传ID数组[]") @RequestBody List<${pkColumnType}> ids) {
         ${changeClassName}Service.deleteAll(ids);
         return new ResponseEntity<>(HttpStatus.OK);
     }
diff --git a/eladmin/eladmin-generator/src/main/resources/template/admin/Entity.ftl b/eladmin/eladmin-generator/src/main/resources/template/admin/Entity.ftl
index c01fe0a..8b7a9af 100644
--- a/eladmin/eladmin-generator/src/main/resources/template/admin/Entity.ftl
+++ b/eladmin/eladmin-generator/src/main/resources/template/admin/Entity.ftl
@@ -25,6 +25,25 @@ import java.sql.Timestamp;
 <#if hasBigDecimal>
 import java.math.BigDecimal;
 </#if>
+<#assign notBlankUsed = false>
+<#assign notNullUsed = false>
+<#if columns??>
+    <#list columns as column>
+        <#if column.istNotNull && column.columnKey != 'PRI'>
+            <#if column.columnType = 'String'>
+                <#assign notBlankUsed = true>
+            <#else>
+                <#assign notNullUsed = true>
+            </#if>
+        </#if>
+    </#list>
+</#if>
+<#if notBlankUsed>
+import javax.validation.constraints.NotBlank;
+</#if>
+<#if notNullUsed>
+import javax.validation.constraints.NotNull;
+</#if>
 import java.io.Serializable;
 <#if auto>
 import com.baomidou.mybatisplus.annotation.IdType;
diff --git a/eladmin/eladmin-generator/src/main/resources/template/admin/QueryCriteria.ftl b/eladmin/eladmin-generator/src/main/resources/template/admin/QueryCriteria.ftl
index 3028323..0436879 100644
--- a/eladmin/eladmin-generator/src/main/resources/template/admin/QueryCriteria.ftl
+++ b/eladmin/eladmin-generator/src/main/resources/template/admin/QueryCriteria.ftl
@@ -34,6 +34,12 @@ import java.util.List;
 public class ${className}QueryCriteria{
 <#if queryColumns??>
     <#list queryColumns as column>
+
+        <#if column.remark != ''>
+    @ApiModelProperty(value = "${column.remark}")
+        <#else>
+    @ApiModelProperty(value = "${column.changeColumnName}")
+        </#if>
     private ${column.columnType} ${column.changeColumnName};
     </#list>
 </#if>
diff --git a/eladmin/eladmin-generator/src/main/resources/template/admin/ServiceImpl.ftl b/eladmin/eladmin-generator/src/main/resources/template/admin/ServiceImpl.ftl
index 3da87d4..d62b8fe 100644
--- a/eladmin/eladmin-generator/src/main/resources/template/admin/ServiceImpl.ftl
+++ b/eladmin/eladmin-generator/src/main/resources/template/admin/ServiceImpl.ftl
@@ -67,7 +67,7 @@ public class ${className}ServiceImpl extends ServiceImpl<${className}Mapper, ${c
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void create(${className} resources) {
-        save(resources);
+        ${changeClassName}Mapper.insert(resources);
     }
 
     @Override
@@ -75,13 +75,13 @@ public class ${className}ServiceImpl extends ServiceImpl<${className}Mapper, ${c
     public void update(${className} resources) {
         ${className} ${changeClassName} = getById(resources.get${pkCapitalColName}());
         ${changeClassName}.copy(resources);
-        saveOrUpdate(${changeClassName});
+        ${changeClassName}Mapper.update(${changeClassName});
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void deleteAll(List<${pkColumnType}> ids) {
-        removeBatchByIds(ids);
+        ${changeClassName}Mapper.deleteBatchIds(ids);
     }
 
     @Override