From 1d8b7df974e1fbdacff7632b05bdc30d78a6a8c1 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Mon, 25 Oct 2021 13:30:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop

---
 zq-erp/src/main/resources/templates/views/admin/activity/activity-sign-update.html |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/zq-erp/src/main/resources/templates/views/admin/activity/activity-sign-update.html b/zq-erp/src/main/resources/templates/views/admin/activity/activity-sign-update.html
index 09be132..896b822 100644
--- a/zq-erp/src/main/resources/templates/views/admin/activity/activity-sign-update.html
+++ b/zq-erp/src/main/resources/templates/views/admin/activity/activity-sign-update.html
@@ -525,7 +525,7 @@
                                     <el-color-picker v-model="typographyColor"></el-color-picker>
                                 </el-form-item>
                                 <el-form-item label="字体大小" style="padding: 10px">
-                                    <el-input-number v-model="typographyNum" :min="10" :max="20" label="描述文字"></el-input-number>
+                                    <el-input-number v-model="typographyNum" :min="10" :max="50" label="描述文字"></el-input-number>
                                 </el-form-item>
                                 <!--<el-form-item label="字体透明度" style="padding: 10px">
                                     <el-input-number v-model="typographyLight" :min="1" :max="100" label="描述文字">%</el-input-number>

--
Gitblit v1.9.1