Merge remote-tracking branch 'origin/MVP1.5.6' into MVP1.5.6

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/controller/TSalaryStandardController.java

@@ -17,6 +17,7 @@
 
 package com.yifu.cloud.plus.v1.yifu.salary.controller;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
@@ -38,6 +39,7 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
+import javax.json.Json;
 import javax.servlet.http.HttpServletResponse;
 import java.util.Date;
 import java.util.List;
@@ -235,7 +237,10 @@ public class TSalaryStandardController {
 	@SysLog("退回薪资表--EKP调用接口")
 	@GetMapping("/backSalaryByApplyNo")
 	public R<String> backSalaryByApplyNo(@RequestParam String applyNo) {
-		return tSalaryStandardService.backSalaryByApplyNo(applyNo);
+		R<String> res  = tSalaryStandardService.backSalaryByApplyNo(applyNo);
+		System.out.println("薪资接口退表接口放回："+applyNo +" |  "+ JSON.toJSONString(res));
+		return  res;
+		//return tSalaryStandardService.backSalaryByApplyNo(applyNo);
 	}
 
 	/**