Merge remote-tracking branch 'origin/master'

# Conflicts:
#	dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgProcessController.java

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgAuditProcessController.java

@@ -1,8 +1,17 @@
 package com.daqing.financial.guarantee.controller;
 
 
+import com.daqing.financial.guarantee.model.response.PaymentConfirmationListResponse;
+import com.daqing.financial.guarantee.service.IDgAuditProcessService;
+import com.daqing.financial.guarantee.service.IDgProcessService;
+import com.daqing.framework.model.response.ResponseResult;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
@@ -17,4 +26,16 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("/dg-audit-process")
 public class DgAuditProcessController {
 
+    @Autowired
+    private IDgAuditProcessService auditProcessService;
+
+    @ApiOperation(value = "审核流程进程列表")
+    @GetMapping("/auditProcessList")
+    public ResponseResult processList(
+            @ApiParam(name = "businessId", value = "业务id", required = true)
+            @RequestParam String businessId){
+        return ResponseResult.SUCCESS();
+    }
+
+
 }

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgLoanNoticeController.java

@@ -39,7 +39,7 @@ public class DgLoanNoticeController {
     @Autowired
     private IDgLoanNoticeService loanNoticeService;
 
-    @ApiOperation(value = "放款通知记录列表")
+    @ApiOperation(value = "放款通知记录列表",response = LoanNoticeListResponse.class)
     @PostMapping("/loanNoticeList")
     public ResponseResult loanNoticeList(
             @ApiParam(name = "loanNoticeQueryRequest", value = "放款通知列表查询条件", required = true)

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgPaymentConfirmationConsiderController.java

@@ -39,7 +39,7 @@ public class DgPaymentConfirmationConsiderController {
     @Autowired
     private IDgPaymentConfirmationConsiderService paymentConfirmationConsiderService;
 
-    @ApiOperation(value = "回款确认记录列表")
+    @ApiOperation(value = "回款确认记录列表",response = PaymentConfirmationListResponse.class)
     @PostMapping("/paymentConfirmationList")
     public ResponseResult paymentConfirmationList(
             @ApiParam(name = "paymentConfirmationQueryRequest", value = "回款确认列表查询条件", required = true)