From ea900039d4f9cb9f44b286bf1fc6c4f54b166b53 Mon Sep 17 00:00:00 2001 From: wangh <9483> Date: Fri, 5 Jan 2024 16:53:19 +0800 Subject: [PATCH] =?UTF-8?q?bug=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/integral/order/detail.vue | 6 +- .../src/views/integral/order/pointsMall.vue | 9 +- .../impl/MerchantConfigServiceImpl.java | 7 +- .../mapper/xml/IntegralOrdersMapper.xml | 2 +- .../mapper/xml/IntegralSettingsMapper.xml | 3 +- .../com/fuint/system/dept/entity/SysDept.java | 2 + .../system/dept/mapper/xml/SysDeptMapper.xml | 5 +- .../dept/service/impl/SysDeptServiceImpl.java | 6 +- .../src/main/resources/application.properties | 4 +- .../views/cashier/NewComponents/Integral.vue | 4 +- gasStation-uni/config.js | 5 +- gasStation-uni/package-lock.json | 1866 +---------------- gasStation-uni/pages/index/index.vue | 2 +- .../pagesHome/PointsMing/PointsMing.vue | 1 + 14 files changed, 35 insertions(+), 1887 deletions(-) diff --git a/fuintAdmin/src/views/integral/order/detail.vue b/fuintAdmin/src/views/integral/order/detail.vue index 994dec593..c560845a4 100644 --- a/fuintAdmin/src/views/integral/order/detail.vue +++ b/fuintAdmin/src/views/integral/order/detail.vue @@ -28,7 +28,7 @@ {{ dataForm.exchangeQuantity }} - + @@ -46,7 +46,7 @@ {{ dataForm.orderNumber }} - + -