Browse Source

解决冲突

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

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

@ -102,4 +102,19 @@ public class DcBaseWorkSpecialController extends BaseController
{
return toAjax(dcBaseWorkSpecialService.deleteDcBaseWorkSpecialDaoByIds(ids));
}
/**
* 查询生产专业管理列表
*/
@PreAuthorize("@ss.hasPermi('special:specialManager:list')")
@GetMapping("/listNoPage")
public AjaxResult listNoPage(DcBaseWorkSpecialDao dcBaseWorkSpecialDao)
{
List<DcBaseWorkSpecialDao> list = dcBaseWorkSpecialService.selectDcBaseWorkSpecialDaoList(dcBaseWorkSpecialDao);
return AjaxResult.success(list);
}
}

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

@ -1,6 +1,5 @@
package com.lzbi.task.service;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.extension.service.IService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.lzbi.task.domain.DcBusiWorkReadLog;
@ -11,13 +10,14 @@ import org.springframework.stereotype.Service;
import java.util.List;
/**
* 编码规则定义Service业务层处理
*
* @author win
* @date 2023-11-29
*/
@DS("workDB")
//@DS("workDB")
@Service
public class WorkParamReadService extends ServiceImpl<WorkParamReadMapper, WorkParamInfo> implements IService<WorkParamInfo>

Loading…
Cancel
Save