Merge remote-tracking branch 'origin/master'

2020-11-18 09:27:39 +08:00
parent 09a5fa70fe 16b188a375
commit 78980120e7
5 changed files with 41 additions and 39 deletions
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/custom/SysOrderController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/custom/SysOrderController.java
@ -84,7 +84,7 @@ public class SysOrderController extends OrderBaseController {
                order.setPhone(order.getPhone().replaceAll("(\\d{3})\\d{4}(\\d{4})", "$1****$2"));
            }
        }
-        return getOrderDataTable(list, totalAmount.longValue());
+        return getOrderDataTable(list, totalAmount);
    }