Merge remote-tracking branch 'origin/dev-2.13.0' into dev

# Conflicts:
#	unis-plugin/unis-plugin-biz/src/main/java/com/unis/reserveLayout/modular/qualityInspectionOrg/service/impl/QualityInspectionServiceImpl.java

unis-plugin/unis-plugin-biz/src/main/java/com/unis/purchaseAndSalesSupervision/modular/bizPssMoGrain/param/BizPssMoGrainIsEnabledByIdParam.java

@@ -13,11 +13,11 @@ public class BizPssMoGrainIsEnabledByIdParam {
 
     /** 轮空期模型优化记录唯一标识符 */
     @ApiModelProperty(value = "id")
-    //@NotBlank(message = "id不能为空")
+    @NotBlank(message = "id不能为空")
     private String id;
 
     /** 是否开启，0：否；1：是； */
     @ApiModelProperty(value = "是否开启，0：否；1：是；")
-    //@NotNull(message = "是否开启不能为空")
+    @NotNull(message = "是否开启不能为空")
     private Integer isEnabled;
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/purchaseAndSalesSupervision/modular/bizPssMoInventoryTimeAnomaly/controller/BizPssMoInventoryTimeAnomalyController.java

@@ -136,7 +136,7 @@ public class BizPssMoInventoryTimeAnomalyController {
     @ApiOperationSupport(order = 6)
     @ApiOperation("在库时间异常模型优化表-开启关闭")
     //@SaCheckPermission("/purchaseAndSalesSupervision/bizPssMoRotationEmptyPeriod/detail")
-    @PostMapping("/purchaseAndSalesSupervision/bizPssMoInventoryTimeAnomaly/isEnabledById")
+    @GetMapping("/purchaseAndSalesSupervision/bizPssMoInventoryTimeAnomaly/isEnabledById")
     public CommonResult<String> isEnabledById(@Valid BizPssMoInventoryTimeAnomalyIsEnabledByIdParam isEnabledByIdParam) {
         bizPssMoInventoryTimeAnomalyService.isEnabledById(isEnabledByIdParam);
         return CommonResult.ok();

unis-plugin/unis-plugin-biz/src/main/java/com/unis/purchaseAndSalesSupervision/modular/bizPssMoRotationEmptyPeriod/controller/BizPssMoRotationEmptyPeriodController.java

@@ -135,7 +135,7 @@ public class BizPssMoRotationEmptyPeriodController {
     @ApiOperationSupport(order = 6)
     @ApiOperation("轮空期模型优化表-开启关闭")
     //@SaCheckPermission("/purchaseAndSalesSupervision/bizPssMoRotationEmptyPeriod/detail")
-    @PostMapping("/purchaseAndSalesSupervision/bizPssMoRotationEmptyPeriod/isEnabledById")
+    @GetMapping("/purchaseAndSalesSupervision/bizPssMoRotationEmptyPeriod/isEnabledById")
     public CommonResult<String> isEnabledById(@Valid BizPssMoRotationEmptyPeriodIsEnabledByIdParam isEnabledByIdParam) {
         bizPssMoRotationEmptyPeriodService.isEnabledById(isEnabledByIdParam);
         return CommonResult.ok();