From 59cf24b0aba393e145f4ba3d58e98b7a01a80992 Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Mon, 14 Feb 2022 14:58:47 +0800 Subject: [PATCH] fix conflict --- zq-erp/src/main/resources/templates/views/admin/sys/sysRole-form.html | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/zq-erp/src/main/resources/templates/views/admin/sys/sysRole-form.html b/zq-erp/src/main/resources/templates/views/admin/sys/sysRole-form.html index f28fefb..1209561 100644 --- a/zq-erp/src/main/resources/templates/views/admin/sys/sysRole-form.html +++ b/zq-erp/src/main/resources/templates/views/admin/sys/sysRole-form.html @@ -60,7 +60,13 @@ </div> </div> <div class="form-group"> - + <label class="col-sm-2 control-label">可查询所有门店客户</label> + <div class="col-sm-4"> + <select class="form-control" name="customer"> + <option th:selected="${obj?.customer == '是'}" >是</option> + <option th:selected="${obj?.customer == '否'}" >否</option> + </select> + </div> <label class="col-sm-2 control-label">是否允许门店分配本角色</label> <div class="col-sm-4"> <select class="form-control" name="shopAble"> -- Gitblit v1.9.1