Browse Source

‘解决冲突’

develop
ljlong_2630 11 months ago
parent
commit
ec4b8fe33d
  1. 3
      lzbi-module/src/main/java/com/lzbi/special/controller/DcBaseWorkSpecialController.java
  2. 4
      lzbi-module/src/main/java/com/lzbi/task/service/WorkParamReadService.java

3
lzbi-module/src/main/java/com/lzbi/special/controller/DcBaseWorkSpecialController.java

@ -1,6 +1,5 @@
package com.lzbi.special.controller; package com.lzbi.special.controller;
import java.time.LocalDateTime;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
@ -120,8 +119,6 @@ public class DcBaseWorkSpecialController extends BaseController
List<DcBaseWorkSpecial> list = dcBaseWorkSpecialService.selectDcBaseWorkSpecialDaoList(dcBaseWorkSpecial); List<DcBaseWorkSpecial> list = dcBaseWorkSpecialService.selectDcBaseWorkSpecialDaoList(dcBaseWorkSpecial);
return AjaxResult.success(list); return AjaxResult.success(list);
} }
/** /**
* 新增生产专业管理 * 新增生产专业管理
*/ */

4
lzbi-module/src/main/java/com/lzbi/task/service/WorkParamReadService.java

@ -13,7 +13,7 @@ import java.util.List;
/** /**
* 编码规则定义Service业务层处理 * 编码规则定义Service业务层处理
* *
* @author win * @author win
* @date 2023-11-29 * @date 2023-11-29
*/ */
@ -23,7 +23,7 @@ public class WorkParamReadService extends ServiceImpl<WorkParamReadMapper, WorkP
{ {
/*获取生产单元的参数读取配置 /*获取生产单元的参数读取配置
* */ * */
public List<DcBusiWorkReadLog> readWorkValue(ReadQueryParams readQueryParams){ public List<DcBusiWorkReadLog> readWorkValue(ReadQueryParams readQueryParams){
return baseMapper.readWorkValue(readQueryParams); return baseMapper.readWorkValue(readQueryParams);
} }

Loading…
Cancel
Save