From ea62a3548fdc6f451cd464120fc98f1c3cca6f0d Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期五, 07 十一月 2025 16:53:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jshdasrs' into jshdasrs

---
 src/main/webapp/static/layuiadmin/json/mall/order.js |   43 +------------------------------------------
 1 files changed, 1 insertions(+), 42 deletions(-)

diff --git a/src/main/webapp/static/layuiadmin/json/mall/order.js b/src/main/webapp/static/layuiadmin/json/mall/order.js
index 9ce2971..c9032c8 100644
--- a/src/main/webapp/static/layuiadmin/json/mall/order.js
+++ b/src/main/webapp/static/layuiadmin/json/mall/order.js
@@ -1,42 +1 @@
-{
-  "code": 0
-  ,"msg": ""
-  ,"count": "100"
-  ,"data": [{
-    "invoice": "X123565541"
-    ,"username": "寮犲皬涓�"
-    ,"orderDate": "2017-11-10"
-    ,"amount": 800
-    ,"status": 1
-  },{
-    "invoice": "X123565542"
-    ,"username": "鏉庡皬鍥�"
-    ,"orderDate": "2017-11-10"
-    ,"amount": 800
-    ,"status": 0
-  },{
-    "invoice": "X123565543"
-    ,"username": "鐜嬭�佷簲"
-    ,"orderDate": "2017-11-10"
-    ,"amount": 800
-    ,"status": 1
-  },{
-    "invoice": "X123565544"
-    ,"username": "璧靛皬鍏�"
-    ,"orderDate": "2017-11-09"
-    ,"amount": 1600
-    ,"status": 1
-  },{
-    "invoice": "X123565545"
-    ,"username": "瀛欏皬涓�"
-    ,"orderDate": "2017-11-09"
-    ,"amount": 1600
-    ,"status": -1
-  },{
-    "invoice": "X123565546"
-    ,"username": "鍛ㄥ皬鍏�"
-    ,"orderDate": "2017-11-08"
-    ,"amount": 2600
-    ,"status": 1
-  }]
-}
\ No newline at end of file
+{"code":0,"msg":"","count":"100","data":[{"invoice":"X123565541","username":"寮犲皬涓�","orderDate":"2017-11-10","amount":800,"status":1},{"invoice":"X123565542","username":"鏉庡皬鍥�","orderDate":"2017-11-10","amount":800,"status":0},{"invoice":"X123565543","username":"鐜嬭�佷簲","orderDate":"2017-11-10","amount":800,"status":1},{"invoice":"X123565544","username":"璧靛皬鍏�","orderDate":"2017-11-09","amount":1600,"status":1},{"invoice":"X123565545","username":"瀛欏皬涓�","orderDate":"2017-11-09","amount":1600,"status":-1},{"invoice":"X123565546","username":"鍛ㄥ皬鍏�","orderDate":"2017-11-08","amount":2600,"status":1}]}
\ No newline at end of file

--
Gitblit v1.9.1