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

2 years ago · 46f7304883
parent 6694536c03 6f93c5952d
commit 46f7304883
1 changed files with 4 additions and 2 deletions
--- a/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtInvoicePoolController.java
+++ b/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtInvoicePoolController.java
@ -258,11 +258,13 @@ public class ExtInvoicePoolController extends AbstractController {
    /**
     * 拉取记录列表获取
     */
-    @IgnoreClientToken
-    @IgnoreUserToken
+
    @RequestMapping("getPullRecordList")
    public ResponseEntity<R> getPullRecordList(@RequestBody PullRecordReq pullRecordReq){
        try{
+            if(pullRecordReq.getSm().equals("99")){
+                pullRecordReq.setSm("");
+            }
            return ResponseEntity.ok(R.ok().put("data",extInvoicePoolService.selectPullRecord(pullRecordReq)));
        }catch (Exception e){
            e.printStackTrace();