DeXun/be-process-control-system
9
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Allenxy
2025-11-10 08:51:42 +08:00
parent 3693a04209 7a901b7ed4
commit 74f4d48884
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
business/src/main/java/com/fizz/business/controller/SetupTensionController.java
View File

@@ -56,7 +56,7 @@ public class SetupTensionController extends BaseController
* 获取全线张力详细信息 * 获取全线张力详细信息
*/ */
@GetMapping() @GetMapping()
public AjaxResult getInfo(@RequestParam Long thick ,@RequestParam Long yieldStren) public AjaxResult getInfo(@RequestParam(required = false) Long thick ,@RequestParam(required = false) Long yieldStren)
{ {
return success(setupTensionService.selectSetupTensionByThick(thick, yieldStren)); return success(setupTensionService.selectSetupTensionByThick(thick, yieldStren));
} }

2
business/src/main/java/com/fizz/business/service/impl/CrmPdiPlanServiceImpl.java
View File

@@ -150,7 +150,7 @@ public class CrmPdiPlanServiceImpl extends ServiceImpl<CrmPdiPlanMapper, CrmPdiP
wrapper.eq("planid", build.getId()); wrapper.eq("planid", build.getId());
CrmPdiPlan pdiPlan = baseMapper.selectOne(wrapper); CrmPdiPlan pdiPlan = baseMapper.selectOne(wrapper);
if (pdiPlan == null) { if (pdiPlan == null) {
log.error("未找到ID为{}的计划记录", build.getId()); log.error("未找到ID为{}的计划记录", build.getId());
return; return;