合并分支 'master' 到 'dev'

dev-repair/src/main/java/com/tykj/dev/device/repair/service/impl/HistoryPepairServiceImpl.java

@@ -58,7 +58,11 @@ public class HistoryPepairServiceImpl implements HistoryPepairService {
                   .stream()
                   .map(HistoryRepairBill::toDb)
                   .collect(Collectors.toList());
-          historyRepairBillDao.saveAll(historyRepairBills);
+          historyRepairBills.forEach(
+                  historyRepairBill -> {
+                      historyRepairBillDao.save(historyRepairBill);
+                  }
+          );
         } catch (IOException e) {
             log.error("[toDb2] 找不到文件路径");
         }

dev-repair/src/main/java/com/tykj/dev/device/repair/subject/domin/HistoryRepairBill.java

@@ -33,7 +33,6 @@ import java.util.List;
 @ApiModel("装备维修完成退回账单")
 public class HistoryRepairBill {
     @Id
-    @GeneratedValue
     @ApiModelProperty(name = "主键id")
     @JsonProperty("id")
     private Integer id;