Merge remote-tracking branch 'origin/master'

business/src/main/java/com/fizz/business/controller/SetupTensionController.java

@@ -56,7 +56,7 @@ public class SetupTensionController extends BaseController
      * 获取全线张力详细信息
      */
     @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));
     }

business/src/main/java/com/fizz/business/service/impl/CrmPdiPlanServiceImpl.java

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