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/shop/parameterSetting-form.html | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/zq-erp/src/main/resources/templates/views/admin/shop/parameterSetting-form.html b/zq-erp/src/main/resources/templates/views/admin/shop/parameterSetting-form.html
index 751099b..0fbaf6f 100644
--- a/zq-erp/src/main/resources/templates/views/admin/shop/parameterSetting-form.html
+++ b/zq-erp/src/main/resources/templates/views/admin/shop/parameterSetting-form.html
@@ -71,6 +71,14 @@
</el-checkbox-group>
</div>
</div>
+
+ <div class="form-group" v-if="paramSetting.type==5">
+ <label class="col-md-2 control-label">{{paramSetting.name}}</label>
+ <div class="col-md-8">
+ <el-input type="textarea" :rows="2" v-model="paramSetting.userValue"></el-input>
+ </div>
+ </div>
+
</template>
--
Gitblit v1.9.1