From 20ef58f1366572e3fc1d2b247b8d9d0530b80d1c Mon Sep 17 00:00:00 2001
From: "DESKTOP-369JRHT\\12997" <9>
Date: Wed, 31 Jul 2024 15:21:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/convenienceStore/inventory/details.vue | 12 +++++++-----
 fuintAdmin_zt/src/assets/styles/index.scss           |  8 ++++++++
 fuintAdmin_zt/src/views/Service/index.vue            |  4 ++--
 fuintAdmin_zt/src/views/Site/index.vue               |  5 +++--
 .../financialStatement/dai_yunyingfenxi/tab/paym.vue |  8 +++++---
 .../dai_yunyingfenxi/tab/paytype.vue                 |  8 +++++---
 .../views/financialStatement/jiaoyiduizhang/list.vue |  2 +-
 .../financialStatement/jiaoyiduizhang/tab/int.vue    |  6 +++---
 .../financialStatement/jiaoyiduizhang/tab/oil.vue    |  6 +++---
 .../financialStatement/jiaoyiduizhang/tab/store.vue  |  6 +++---
 .../financialStatement/jiaoyiduizhang/tab/vip.vue    | 10 +++++-----
 .../views/financialStatement/yunyingfenxi/list.vue   |  2 +-
 .../financialStatement/yunyingfenxi/tab/int.vue      |  8 +++++---
 .../financialStatement/yunyingfenxi/tab/oil.vue      | 11 +++++++----
 .../financialStatement/yunyingfenxi/tab/store.vue    |  6 ++++--
 .../financialStatement/yunyingfenxi/tab/vip.vue      |  9 ++++++---
 fuintAdmin_zt/src/views/indexBanner/index.vue        | 11 +++++++----
 fuintAdmin_zt/src/views/setting/app/index.vue        |  4 ++--
 fuintAdmin_zt/src/views/setting/banner/index.vue     |  4 ++--
 fuintAdmin_zt/src/views/setting/hardware.vue         |  4 ++--
 fuintAdmin_zt/src/views/setting/message.vue          |  4 ++--
 fuintAdmin_zt/src/views/setting/pay/index.vue        |  4 ++--
 fuintAdmin_zt/src/views/setting/sysLog.vue           | 10 ++--------
 .../src/views/system/notify/page/getNotify.vue       |  4 ++--
 fuintAdmin_zt/src/views/system/notify/page/mode.vue  |  4 ++--
 .../src/views/system/notify/page/record.vue          |  4 ++--
 .../business/convenienceSore/entity/MtInventory.java |  2 +-
 27 files changed, 94 insertions(+), 72 deletions(-)

diff --git a/fuintAdmin/src/views/convenienceStore/inventory/details.vue b/fuintAdmin/src/views/convenienceStore/inventory/details.vue
index b39544a92..6029fd063 100644
--- a/fuintAdmin/src/views/convenienceStore/inventory/details.vue
+++ b/fuintAdmin/src/views/convenienceStore/inventory/details.vue
@@ -471,15 +471,17 @@ export default {
     change(data,flag) {
       let profitLossAmount = new BigNumber(data.profitLossAmount);
       let inventoryDiscrepancy = new BigNumber(data.inventoryDiscrepancy);
-      let inventoryQuantity = new BigNumber(data.inventoryQuantity);
-      let damageQuantity = new BigNumber(data.damageQuantity);
+      let inventoryQuantity = new BigNumber(data.inventoryQuantity); //正常
+      let damageQuantity = new BigNumber(data.damageQuantity); //货损
       let purchasePrice = new BigNumber(data.purchasePrice);
       let stock = new BigNumber(data.stock);
       // 计算库存差异
-
-      let addStocke =  inventoryQuantity.minus(damageQuantity)
+      console.log("inventoryQuantity",inventoryQuantity)
+      console.log("damageQuantity",damageQuantity)
+      console.log("stock",stock)
+      let addStocke =  inventoryQuantity.minus(damageQuantity) // 正常减货损
       // let addStocke =  inventoryQuantity.plus(damageQuantity)
-      inventoryDiscrepancy = addStocke.minus(stock)
+      inventoryDiscrepancy = addStocke.minus(stock) //
       // 计算盈亏金额
       profitLossAmount = inventoryDiscrepancy.multipliedBy(purchasePrice);
       data.inventoryDiscrepancy = inventoryDiscrepancy.toNumber();
diff --git a/fuintAdmin_zt/src/assets/styles/index.scss b/fuintAdmin_zt/src/assets/styles/index.scss
index defa70e9b..03b44a4ba 100644
--- a/fuintAdmin_zt/src/assets/styles/index.scss
+++ b/fuintAdmin_zt/src/assets/styles/index.scss
@@ -124,6 +124,14 @@ aside {
   padding: 20px;
 }
 
+.card-change {
+padding: 20px;
+  //width: 80% !important;
+  background: #ffffff;
+  border-radius: 4px;
+  min-height: 600px;
+}
+
 .components-container {
   margin: 30px 50px;
   position: relative;
diff --git a/fuintAdmin_zt/src/views/Service/index.vue b/fuintAdmin_zt/src/views/Service/index.vue
index 925d5f97b..63f9bc7df 100644
--- a/fuintAdmin_zt/src/views/Service/index.vue
+++ b/fuintAdmin_zt/src/views/Service/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-card >
+    <div class="card-change">
       <div class="top-box">
         <div class="d-s">
           <el-input v-model="queryParams.name" placeholder="请输入油站名称" style="width: 200px;margin-right: 15px;"></el-input>
@@ -165,7 +165,7 @@
         @pagination="getStoreList"
       />
 
-    </el-card>
+    </div>
 
 <!--    <el-card style="margin-top: 20px" v-for="(item,index) in arrlist" :key="index">-->
 <!--      <div slot="header" class="clearfix">-->
diff --git a/fuintAdmin_zt/src/views/Site/index.vue b/fuintAdmin_zt/src/views/Site/index.vue
index 28d78986b..712998414 100644
--- a/fuintAdmin_zt/src/views/Site/index.vue
+++ b/fuintAdmin_zt/src/views/Site/index.vue
@@ -7,7 +7,7 @@
 
     <el-row style="padding: 20px">
       <el-col :span="6">
-        <el-card  style="margin-right: 5px">
+        <el-card  style="margin-right: 5px; border: none;box-shadow: none;" shadow="never">
           <div class="left-box">
             <div class="title-h">组织架构</div>
 
@@ -36,7 +36,8 @@
       </el-col>
 
       <el-col :span="18">
-        <el-card style="margin-bottom: 20px;">
+        <el-card style="margin-bottom: 20px;border: none;
+box-shadow: none;" shadow="never">
 <!--          <el-tabs v-model="activeName" @tab-click="handleClick">-->
 <!--        用户信息    -->
 <!--            <el-tab-pane label="用户信息" name="list">-->
diff --git a/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/tab/paym.vue b/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/tab/paym.vue
index e8c041363..f19a6b1ad 100644
--- a/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/tab/paym.vue
+++ b/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/tab/paym.vue
@@ -1,7 +1,7 @@
 <!-- 收银台订单-->
 <template>
-  <div style="margin-top: 0px;margin-right: 40px">
-    <el-card class="box-card" style="margin-top: 0px;">
+  <div style="padding-top: 20px; padding-right: 40px; background: #f6f8f9;">
+    <el-card class="box-card" style="margin-top: 0px;" shadow="never">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px" >
         <div class="d-s" style="margin-bottom: 15px;justify-content: space-between">
           <div class="d-s">
@@ -51,7 +51,7 @@
         </div>
       </div>
     </el-card>
-    <el-card class="box-card">
+    <el-card class="box-card" style="min-height: 500px;" shadow="never">
       <div class="table-box">
         <el-table
           :data="orderList"
@@ -333,6 +333,8 @@ export default {
 .box-card {
   width: 100%;
   margin: 0px 20px 20px 20px;
+  border: none;
+  box-shadow: none;
 }
 
 .el-form--inline .el-form-item {
diff --git a/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/tab/paytype.vue b/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/tab/paytype.vue
index 30aedb7c2..84ebeb58d 100644
--- a/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/tab/paytype.vue
+++ b/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/tab/paytype.vue
@@ -1,7 +1,7 @@
 <!-- 收银台订单-->
 <template>
-  <div style="margin-top: 0px;margin-right: 40px">
-    <el-card class="box-card">
+  <div style="padding-top: 20px; padding-right: 40px; background: #f6f8f9;">
+    <el-card class="box-card" shadow="never">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
         <div class="d-s" style="justify-content: space-between">
           <div class="d-s">
@@ -62,7 +62,7 @@
         </div>
       </div>
     </el-card>
-    <el-card class="box-card">
+    <el-card class="box-card" style="min-height: 500px;" shadow="never">
       <div class="table-box">
         <el-table
           :data="orderList"
@@ -300,6 +300,8 @@ export default {
 .box-card {
   width: 100%;
   margin: 0px 20px 20px 20px;
+  border: none;
+  box-shadow: none;
 }
 
 .el-form--inline .el-form-item {
diff --git a/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/list.vue b/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/list.vue
index 47174c979..2e3cc5978 100644
--- a/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/list.vue
+++ b/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/list.vue
@@ -84,7 +84,7 @@ export default {
 .app-top{
   width: 100%;
   //margin-bottom: 20px;
-  height: 60px;
+  //height: 60px;
   box-sizing: border-box;
 
 }
diff --git a/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/int.vue b/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/int.vue
index 32cfa8ea7..4e1a4f393 100644
--- a/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/int.vue
+++ b/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/int.vue
@@ -1,7 +1,7 @@
 <!-- 收银台订单-->
 <template>
-  <div style="margin-top: 0px;margin-right: 40px">
-    <el-card class="box-card">
+  <div style="background: #f6f8f9;width: 100%;padding: 20px;height: 100vh">
+    <div class="card-change">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
         <el-form-item label="" prop="deptId" style="width: 180px">
           <el-select
@@ -140,7 +140,7 @@
         @pagination="getList"
       />
 
-    </el-card>
+    </div>
 
   </div>
 </template>
diff --git a/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/oil.vue b/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/oil.vue
index aa4db4ad8..fc4df9313 100644
--- a/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/oil.vue
+++ b/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/oil.vue
@@ -1,7 +1,7 @@
 <!-- 收银台订单-->
 <template>
-  <div style="margin-top: 0px;margin-right: 40px">
-    <el-card class="box-card">
+  <div style="background: #f6f8f9;width: 100%;padding: 20px;height: 100vh">
+    <div class="card-change">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
         <el-form-item label="" prop="deptId" style="width: 180px">
           <el-select
@@ -136,7 +136,7 @@
         @pagination="getList"
       />
 
-    </el-card>
+    </div>
 
   </div>
 </template>
diff --git a/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/store.vue b/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/store.vue
index 760403a9d..edcf906a1 100644
--- a/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/store.vue
+++ b/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/store.vue
@@ -1,7 +1,7 @@
 <!-- 收银台订单-->
 <template>
-  <div style="margin-top: 0px;margin-right: 40px">
-    <el-card class="box-card">
+  <div style="background: #f6f8f9;width: 100%;padding: 20px;height: 100vh">
+    <div class="card-change">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
         <el-form-item label="" prop="deptId" style="width: 180px">
           <el-select
@@ -134,7 +134,7 @@
         @pagination="getList"
       />
 
-    </el-card>
+    </div>
 
   </div>
 </template>
diff --git a/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/vip.vue b/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/vip.vue
index d02033d87..43db0537a 100644
--- a/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/vip.vue
+++ b/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/vip.vue
@@ -1,7 +1,7 @@
 <!-- 收银台订单-->
 <template>
-  <div style="margin-top: 0px;margin-right: 40px">
-    <el-card class="box-card">
+  <div style="background: #f6f8f9;width: 100%;padding: 20px;height: 100vh" >
+    <div class="card-change">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
         <el-form-item label="" prop="deptId" style="width: 180px">
           <el-select
@@ -152,7 +152,7 @@
         @pagination="getList"
       />
 
-    </el-card>
+    </div>
   </div>
 </template>
 
@@ -266,8 +266,8 @@ import {getRunningWaterByTissueApi} from "@/api/allOrder";
 
 <style scoped>
   .box-card{
-    width: 100%;
-    margin: 0px 20px 20px 20px;
+    //width: 100%;
+    //margin: 0px 20px 20px 20px;
   }
 
   .el-form--inline .el-form-item {
diff --git a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/list.vue b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/list.vue
index 2359df417..bcf9503b6 100644
--- a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/list.vue
+++ b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/list.vue
@@ -103,7 +103,7 @@ export default {
 .app-top{
   width: 100%;
   //margin-bottom: 20px;
-  height: 60px;
+  //height: 60px;
   box-sizing: border-box;
 
 }
diff --git a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/int.vue b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/int.vue
index 097f0dca2..4c53173cb 100644
--- a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/int.vue
+++ b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/int.vue
@@ -1,7 +1,7 @@
 <!-- 收银台订单-->
 <template>
-  <div style="margin-top: 0px;margin-right: 40px">
-    <el-card class="box-card">
+  <div style="padding-top: 20px; padding-right: 40px; background: #f6f8f9;">
+    <el-card class="box-card" shadow="never">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
         <div class="d-s"  style="justify-content: space-between;width: 100%">
           <div class="d-s">
@@ -58,7 +58,7 @@
         </div>
       </div>
     </el-card>
-    <el-card class="box-card">
+    <el-card class="box-card" style="min-height: 500px;" shadow="never">
       <div class="table-box">
         <el-table
           :data="orderList"
@@ -288,6 +288,8 @@ export default {
 .box-card {
   width: 100%;
   margin: 0px 20px 20px 20px;
+  border: none;
+  box-shadow: none;
 }
 
 .el-form--inline .el-form-item {
diff --git a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/oil.vue b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/oil.vue
index 1058e06db..1a146017f 100644
--- a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/oil.vue
+++ b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/oil.vue
@@ -1,7 +1,7 @@
 <!-- 收银台订单-->
 <template>
-  <div style="margin-top: 0px; margin-right: 40px">
-    <el-card class="box-card">
+  <div style="padding-top: 20px; padding-right: 40px; background: #f6f8f9;">
+    <el-card class="box-card" shadow="never">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
         <div class="d-s" style="justify-content: space-between;width: 100%">
           <div class="d-s">
@@ -68,12 +68,13 @@
         </div>
       </div>
           </el-card>
-          <el-card class="box-card">
+          <el-card class="box-card" style="min-height: 500px;" shadow="never">
 
 
-      <div class="table-box">
+      <div class="table-box" >
         <el-table
           :data="orderList"
+          border
           style="width: 100%">
           <el-table-column type="index" width="50" align="center" label="序号"/>
           <el-table-column align="center" prop="storeName" label="机构名称"></el-table-column>
@@ -331,6 +332,8 @@ import {parseTime} from "@/utils/fuint";
 .box-card{
   width: 100%;
   margin: 0px 20px 20px 20px;
+  border: none;
+  box-shadow: none;
 }
 
 .el-form--inline .el-form-item {
diff --git a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/store.vue b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/store.vue
index 9cd86ceb2..9f404089b 100644
--- a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/store.vue
+++ b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/store.vue
@@ -1,6 +1,6 @@
 <!-- 收银台订单-->
 <template>
-  <div style="margin-top: 0px; margin-right: 40px">
+  <div style="padding-top: 20px; padding-right: 40px; background: #f6f8f9;" shadow="never">
     <el-card class="box-card">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px" >
         <div class="d-s" style="justify-content: space-between;width: 100%">
@@ -59,7 +59,7 @@
         </div>
       </div>
       </el-card>
-      <el-card class="box-card">
+      <el-card class="box-card" style="min-height: 500px;" shadow="never">
       <div class="table-box">
         <el-table
           :data="orderList"
@@ -307,6 +307,8 @@ import {parseTime} from "@/utils/fuint";
 .box-card{
   width: 100%;
   margin: 0px 20px 20px 20px;
+  border: none;
+  box-shadow: none;
 }
 
 .el-form--inline .el-form-item {
diff --git a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/vip.vue b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/vip.vue
index 554483f48..bd913e2b3 100644
--- a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/vip.vue
+++ b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/vip.vue
@@ -1,7 +1,7 @@
 <!-- 收银台订单-->
 <template>
-  <div style="margin-top: 0px;margin-right: 40px">
-    <el-card class="box-card">
+  <div class=""  style="padding-top: 20px; padding-right: 40px; background: #f6f8f9;min-height: 900px;">
+    <el-card class="box-card"  shadow="never">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
         <el-form-item label="" prop="deptId" style="width: 180px">
           <el-select
@@ -52,10 +52,11 @@
         </div>
       </div>
           </el-card>
-          <el-card class="box-card">
+          <el-card class="box-card" style="min-height: 500px;"  shadow="never">
       <div class="table-box">
         <el-table
           :data="orderList"
+          border
           style="width: 100%">
           <el-table-column type="index" width="50" align="center" label="序号"/>
           <el-table-column prop="userName" align="center" label="会员名称"> </el-table-column>
@@ -228,6 +229,8 @@ import {getFenXiUserbalanceDataApi, getFenXiUserbalanceListApi} from "@/api/fina
   .box-card{
     width: 100%;
     margin: 0px 20px 20px 20px;
+    border: none;
+    box-shadow: none;
   }
 
   .el-form--inline .el-form-item {
diff --git a/fuintAdmin_zt/src/views/indexBanner/index.vue b/fuintAdmin_zt/src/views/indexBanner/index.vue
index 07596a43e..b5ea423a9 100644
--- a/fuintAdmin_zt/src/views/indexBanner/index.vue
+++ b/fuintAdmin_zt/src/views/indexBanner/index.vue
@@ -1,6 +1,7 @@
 <template>
-  <div style="margin: 20px">
-    <el-card class="card" style="margin-bottom: 20px">
+  <div style="padding: 20px;background: #f6f8f9;">
+    <el-card class="card" style="margin-bottom: 20px;border: none;
+box-shadow: none;" shadow="never" >
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
         <el-form-item label="店铺" prop="storeId">
           <el-select v-model="queryParams.storeId" filterable placeholder="请选择店铺" clearable style="width: 100%">
@@ -27,8 +28,10 @@
       </el-form>
     </el-card>
 
-    <el-card class="card">
-      <div style="margin-bottom: 10px">
+    <el-card class="card" style="border: none;
+box-shadow: none;" shadow="never">
+      <div style="margin-bottom: 10px;border: none;
+box-shadow: none;" shadow="never">
         <el-button
           type="primary"
           icon="el-icon-plus"
diff --git a/fuintAdmin_zt/src/views/setting/app/index.vue b/fuintAdmin_zt/src/views/setting/app/index.vue
index 7c479a1d5..d36cb9b50 100644
--- a/fuintAdmin_zt/src/views/setting/app/index.vue
+++ b/fuintAdmin_zt/src/views/setting/app/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-card >
+    <div class="card-change">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
         <el-form-item label="" prop="legalRepresentativeContact">
 
@@ -93,7 +93,7 @@
         @pagination="getList"
       />
 
-    </el-card>
+    </div>
 
     <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="30%" append-to-body>
       <!--      <el-form ref="form" :model="deviceInfo" label-width="80px">-->
diff --git a/fuintAdmin_zt/src/views/setting/banner/index.vue b/fuintAdmin_zt/src/views/setting/banner/index.vue
index 39812f9d9..85722ee21 100644
--- a/fuintAdmin_zt/src/views/setting/banner/index.vue
+++ b/fuintAdmin_zt/src/views/setting/banner/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-card >
+    <div class="card-change" >
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
         <el-form-item label="" prop="name">
           <el-input
@@ -111,7 +111,7 @@
       @pagination="getList"
     />
 
-    </el-card>
+    </div>
 
     <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="55%" append-to-body>
       <el-form ref="form" :model="deviceInfo" label-width="80px" :rules="rules">
diff --git a/fuintAdmin_zt/src/views/setting/hardware.vue b/fuintAdmin_zt/src/views/setting/hardware.vue
index 5db65fe41..e945aa6d8 100644
--- a/fuintAdmin_zt/src/views/setting/hardware.vue
+++ b/fuintAdmin_zt/src/views/setting/hardware.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-card >
+    <div class="card-change" >
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="90px">
         <el-form-item label="" prop="name">
           <el-input
@@ -112,7 +112,7 @@
         @pagination="getList"
       />
 
-    </el-card>
+    </div>
 
     <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="50%" append-to-body>
       <el-form ref="form" :rules="rules" :model="form" label-width="80px">
diff --git a/fuintAdmin_zt/src/views/setting/message.vue b/fuintAdmin_zt/src/views/setting/message.vue
index 86fb18fed..71325600c 100644
--- a/fuintAdmin_zt/src/views/setting/message.vue
+++ b/fuintAdmin_zt/src/views/setting/message.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-card >
+    <div class="card-change">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="180px">
         <el-form-item label="" prop="name">
           <el-input
@@ -89,7 +89,7 @@
         @pagination="getList"
       />
 
-    </el-card>
+    </div>
 
     <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="35%" append-to-body>
       <el-form ref="form" :rules="rules" :model="form" label-width="120px">
diff --git a/fuintAdmin_zt/src/views/setting/pay/index.vue b/fuintAdmin_zt/src/views/setting/pay/index.vue
index 8381410dc..15ea2ffb3 100644
--- a/fuintAdmin_zt/src/views/setting/pay/index.vue
+++ b/fuintAdmin_zt/src/views/setting/pay/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-card >
+    <div class="card-change">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
         <el-form-item label="" prop="deptId">
 <!--          <el-input-->
@@ -129,7 +129,7 @@
         @pagination="getList"
       />
 
-    </el-card>
+    </div>
 
     <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="30%" append-to-body>
         <el-form :model="deviceInfo" ref="deviceForm" label-width="120px"  :rules="rules">
diff --git a/fuintAdmin_zt/src/views/setting/sysLog.vue b/fuintAdmin_zt/src/views/setting/sysLog.vue
index 8184bd174..74dd5fc8b 100644
--- a/fuintAdmin_zt/src/views/setting/sysLog.vue
+++ b/fuintAdmin_zt/src/views/setting/sysLog.vue
@@ -8,18 +8,12 @@
 
 
 
-    <el-card style="margin: 20px">
+    <div class="card-change"  style="margin: 20px">
 <!--      <el-tabs v-model="activeName" @tab-click="handleClick">-->
 <!--        <el-tab-pane label="中台系统" name="first"></el-tab-pane>-->
 <!--        <el-tab-pane label="油站系统" name="second"></el-tab-pane>-->
 <!--      </el-tabs>-->
 
-
-
-
-
-
-
 <!--=======-->
 <!--    <el-card >-->
 <!--      <el-tabs v-model="activeName" @tab-click="handleClick">-->
@@ -119,7 +113,7 @@
         @pagination="getList"
       />
 
-    </el-card>
+    </div>
 
     <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="50%" append-to-body>
       <el-form ref="form" :rules="rules" :model="form" label-width="80px">
diff --git a/fuintAdmin_zt/src/views/system/notify/page/getNotify.vue b/fuintAdmin_zt/src/views/system/notify/page/getNotify.vue
index 21a25d93f..a6847ac3a 100644
--- a/fuintAdmin_zt/src/views/system/notify/page/getNotify.vue
+++ b/fuintAdmin_zt/src/views/system/notify/page/getNotify.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-card >
+    <div class="card-change">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
         <el-form-item label="" prop="deptName">
           <el-input
@@ -45,7 +45,7 @@
         @pagination="getList"
       />
 
-    </el-card>
+    </div>
   </div>
 </template>
 
diff --git a/fuintAdmin_zt/src/views/system/notify/page/mode.vue b/fuintAdmin_zt/src/views/system/notify/page/mode.vue
index fc83b5bbe..f9a6712d6 100644
--- a/fuintAdmin_zt/src/views/system/notify/page/mode.vue
+++ b/fuintAdmin_zt/src/views/system/notify/page/mode.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-card >
+    <div class="card-change">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
         <el-form-item label="" prop="notificationName">
           <el-input
@@ -90,7 +90,7 @@
         @pagination="getList"
       />
 
-    </el-card>
+    </div>
 
     <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="50%" append-to-body>
       <el-form :model="form" label-width="120px">
diff --git a/fuintAdmin_zt/src/views/system/notify/page/record.vue b/fuintAdmin_zt/src/views/system/notify/page/record.vue
index 28321c2c4..be59596d3 100644
--- a/fuintAdmin_zt/src/views/system/notify/page/record.vue
+++ b/fuintAdmin_zt/src/views/system/notify/page/record.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-card >
+    <div class="card-change">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
         <el-form-item label="" prop="deptName">
           <el-input
@@ -93,7 +93,7 @@
         @pagination="getList"
       />
 
-    </el-card>
+    </div>
 
     <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="35%" append-to-body>
       <el-form ref="form" :model="form" label-width="80px">
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/entity/MtInventory.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/entity/MtInventory.java
index 45efa33ad..8df348c67 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/entity/MtInventory.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/entity/MtInventory.java
@@ -31,7 +31,7 @@ public class MtInventory extends BaseEntity {
     /**
      * 制单日期
      */
-//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
     private Date orderDate;
     /**
      * 审核人