Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/xjrsoft/module/textbook/controller/TextbookController.java

@@ -146,7 +146,6 @@ public class TextbookController {
     @SaCheckPermission("textbook:delete")
     public RT<Boolean> delete(@Valid @RequestBody List<Long> ids){
         return RT.ok(textbookService.delete(ids));
-
     }
 
     @GetMapping("/export")

src/main/java/com/xjrsoft/module/textbook/entity/TextbookCoreAttribute.java

@@ -103,6 +103,4 @@ public class TextbookCoreAttribute implements Serializable {
     */
     @ApiModelProperty("主编")
     private String editorInChief;
-
-
 }

src/main/java/com/xjrsoft/module/textbook/service/impl/TextbookServiceImpl.java

@@ -833,6 +833,10 @@ public class TextbookServiceImpl extends MPJBaseServiceImpl<TextbookMapper, Text
 
         //批量插入或更新数据
         for (TextbookImportDto textbookImportDto : dataList) {
+            TextbookCoreAttribute textbookCoreAttribute = new TextbookCoreAttribute();
+            BeanUtils.copyProperties(textbookImportDto, textbookCoreAttribute);
+
+
             Textbook textbook = new Textbook();
             BeanUtils.copyProperties(textbookImportDto, textbook);