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

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/controller/DbUsageRecordController.java

@@ -55,7 +55,7 @@ public class DbUsageRecordController extends AbstractController {
         BeanUtils.copyProperties(dbUsageRecordBo, dbUsageRecord);
         if (dbUsageRecordService.save(dbUsageRecord)) {
             if(dbUsageRecord.getGasPressure() != null){
-                dbStockService.update(new LambdaUpdateWrapper<DbStock>().eq(DbStock::getId,dbUsageRecordBo.getId()).set(DbStock::getGasPressure,dbUsageRecord.getGasPressure()));
+                dbStockService.update(new LambdaUpdateWrapper<DbStock>().eq(DbStock::getId,dbUsageRecordBo.getStcokId()).set(DbStock::getGasPressure,dbUsageRecord.getGasPressure()));
             }
             return ResultData.success("操作成功");
         }

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/domain/bo/DbUsageRecordBo.java

@@ -27,7 +27,6 @@ public class DbUsageRecordBo extends PageQuery implements Serializable {
 
     @ApiModelProperty("主键id")
     @JsonSerialize(using = ToStringSerializer.class)
-    @TableId(value = "id", type = IdType.ASSIGN_ID)
     private Long id;
 
     @ApiModelProperty("库存id")
@@ -79,11 +78,11 @@ public class DbUsageRecordBo extends PageQuery implements Serializable {
     private Integer gasPressure;
 
     @ApiModelProperty("开始时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime startTime;
 
     @ApiModelProperty("结束时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime endTime;
 
     @ApiModelProperty("使用图片")