修改查询条件

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

@@ -228,10 +228,10 @@ public class DbStockController extends AbstractController {
     public ResultData list(@RequestBody DbStockParam dbStockParam) {
         //查询条件
         LambdaQueryWrapper<DbStock> queryWrapper = new LambdaQueryWrapper<>();
-        //气瓶编号 气瓶名称 实验室名称
+        //气瓶名称 实验室名称
         if (StringUtils.isNotBlank(dbStockParam.getSearchValue())) {
             queryWrapper.and(wrapper -> {
-                wrapper.like(DbStock::getGasName, dbStockParam.getSearchValue()).or().like(DbStock::getSubjectName, dbStockParam.getSearchValue());
+                wrapper.like(DbStock::getGasName, dbStockParam.getSearchValue()).or().like(DbStock::getSubjectName, dbStockParam.getSearchValue()).or().like(DbStock::getRoomNum, dbStockParam.getSearchValue());
             });
         }
         if (Objects.nonNull(dbStockParam.getCollegeId())) {

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/domain/vo/WarningNoticeLogVO.java

@@ -172,5 +172,6 @@ public class WarningNoticeLogVO {
     private String updateName;
 
     @ApiModelProperty("修改时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime updateTime;
 }