Merge remote-tracking branch 'origin/master_0929' into master_0929

@@ -435,7 +435,7 @@ public class ContractDistributorStandardController extends DefaultBaseController
 
 
     @ApiModelProperty("锁价")
     @ApiModelProperty("锁价")
     @PostMapping("/priceLock")
     @PostMapping("/priceLock")
-    public void priceLock(@RequestBody UpdateContractDistributorStandardVo vo) {
+    public InvokeResult<Void> priceLock(@RequestBody UpdateContractDistributorStandardVo vo) {
         if (vo == null || StringUtils.isBlank(vo.getId())) {
         if (vo == null || StringUtils.isBlank(vo.getId())) {
             throw new DefaultClientException("参数错误！");
             throw new DefaultClientException("参数错误！");
         }
         }
@@ -443,6 +443,8 @@ public class ContractDistributorStandardController extends DefaultBaseController
         contractDistributorStandardService.stockContractPriceLock(vo);
         contractDistributorStandardService.stockContractPriceLock(vo);
 
 
         contractDistributorStandardService.cleanCacheByKey(vo.getId());
         contractDistributorStandardService.cleanCacheByKey(vo.getId());
+
+        return InvokeResultBuilder.success();
     }
     }
 
 
     /**
     /**