Merge branch 'xinghong-dev' into 'master'

928255095

2021-09-07 65763d38cf9b6b8067a293d9c99297efea0de3e3

 service-acct/src/main/java/com/java110/acct/api/AccountBankApi.java

@@ -94,8 +94,8 @@
     * @return
     */
    @RequestMapping(value = "/queryAccountBank", method = RequestMethod.GET)
    public ResponseEntity<String> queryAccountBank(@RequestParam(value = "shopId") String shopId,
                                                   @RequestParam(value = "bankId") String bankId,
    public ResponseEntity<String> queryAccountBank(@RequestParam(value = "shopId",required = false) String shopId,
                                                   @RequestParam(value = "bankId",required = false) String bankId,
                                                      @RequestParam(value = "page") int page,
                                                      @RequestParam(value = "row") int row) {
        AccountBankDto accountBankDto = new AccountBankDto();