From b9735557fd49607d5f3eeb4decf6d071b10ffc87 Mon Sep 17 00:00:00 2001
From: hurui <177768073@qq.com>
Date: Tue, 2 Aug 2022 22:15:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gas-station-list/gas-station-list.component.html          | 4 ++--
 src/app/admin/system/system-user/system-user.component.html   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/app/admin/merchant-store/gas-station-list/gas-station-list.component.html b/src/app/admin/merchant-store/gas-station-list/gas-station-list.component.html
index 6e12a5e..a2e1d21 100644
--- a/src/app/admin/merchant-store/gas-station-list/gas-station-list.component.html
+++ b/src/app/admin/merchant-store/gas-station-list/gas-station-list.component.html
@@ -83,8 +83,8 @@
                 <th nzWidth="140px">所在商户</th>
                 <th nzWidth="200px">油站名称</th>
                 <th nzWidth="90px">预存类型</th>
-                <th nzWidth="90px">账户余额</th>
-                <th nzWidth="90px">预警余额</th>
+                <th nzWidth="120px">账户余额</th>
+                <th nzWidth="120px">预警余额</th>
                 <th nzWidth="90px">预警状态</th>
                 <th nzWidth="100px">油站编号</th>
                 <th nzWidth="150px">油站地址</th>
diff --git a/src/app/admin/system/system-user/system-user.component.html b/src/app/admin/system/system-user/system-user.component.html
index 437fc0b..4334564 100644
--- a/src/app/admin/system/system-user/system-user.component.html
+++ b/src/app/admin/system/system-user/system-user.component.html
@@ -148,9 +148,9 @@
     </nz-form-item>
 
     <nz-form-item>
-      <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired>通知权限</nz-form-label>
+      <nz-form-label [nzSm]="6" [nzXs]="24">通知权限</nz-form-label>
       <nz-form-control [nzSm]="14" [nzXs]="24">
-        <nz-select style="width: 100%;" formControlName="roleId" nzShowSearch nzAllowClear nzPlaceHolder="请选择功能标签">
+        <nz-select style="width: 100%;" nzMode="multiple" formControlName="label" nzShowSearch nzAllowClear nzPlaceHolder="请选择功能标签">
           <nz-option *ngFor="let item of userLabelArray" [nzValue]="item.codeValue" [nzLabel]="item.codeName"></nz-option>
         </nz-select>
       </nz-form-control>