Merge branch 'dev_tide' into dev_tide_zlglxt_xinlan

zouyu

8 天以前 09394848ce262aff81897503d32ec334fd3f2b6f

 src/main/java/com/ruoyi/account/controller/AccountReconciliationController.java

@@ -70,8 +70,8 @@
     */
    @GetMapping("/page")
    @ApiOperation("分页查询")
    public AjaxResult accountListPage(Page page) {
        return AjaxResult.success(accountReconciliationService.page(page));
    public AjaxResult accountReconciliationListPage(Page page,AccountReconciliation accountReconciliation) {
        return AjaxResult.success(accountReconciliationService.accountReconciliationListPage(page, accountReconciliation));
    }