提交代码

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="120px">账户余额</th>
-                <th nzWidth="90px">预警余额</th>
+                <th nzWidth="120px">预警余额</th>
                 <th nzWidth="90px">预警状态</th>
                 <th nzWidth="100px">油站编号</th>
                 <th nzWidth="150px">油站地址</th>

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>