From 025ce634be776644180b7f1f361b5533a063a230 Mon Sep 17 00:00:00 2001 From: zhoushihao <zsh19950802@163.com> Date: 星期二, 07 五月 2024 21:37:25 +0800 Subject: [PATCH] fixbug:代码被后续提交覆盖代码恢复 移除maven工具包 新增定时任务 忽略日志文件 新增日志输入 Merge branch 'security 20240424' 权限管理开发基本功能已完成,待前端对接 --- hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/controller/BigStorageCageOutTaskController.java | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/controller/BigStorageCageOutTaskController.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/controller/BigStorageCageOutTaskController.java index e6d5946..d98ee38 100644 --- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/controller/BigStorageCageOutTaskController.java +++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/controller/BigStorageCageOutTaskController.java @@ -1,8 +1,6 @@ package com.mes.userinfo.controller; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.mes.bigstorage.entity.BigStorageCage; import com.mes.bigstoragetask.entity.BigStorageCageOutTask; import com.mes.bigstoragetask.service.BigStorageCageOutTaskService; import io.swagger.annotations.ApiModel; @@ -10,14 +8,13 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; - import org.springframework.web.bind.annotation.RestController; import java.util.List; /** * <p> - * 鍓嶇鎺у埗鍣� + * 鍓嶇鎺у埗鍣� * </p> * * @author zhoush @@ -25,12 +22,11 @@ */ @ApiModel("鍑虹墖浠诲姟淇℃伅") @RestController -@RequestMapping("/userinfo/big-storage-cage-out-task") +@RequestMapping("/big-storage-cage-out-task") public class BigStorageCageOutTaskController { @Autowired private BigStorageCageOutTaskService bigStorageCageOutTaskService; - @ApiOperation("杩涚墖浠诲姟淇℃伅") @GetMapping("/querybigStorageCageTask") public List<BigStorageCageOutTask> querybigStorageCageOutTask(int taskState) { -- Gitblit v1.8.0