From 9a341d58bf0cfc4d9c0b9be745671f4e5c490b02 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 20 Jul 2021 14:29:51 +0800
Subject: [PATCH] Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop

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

diff --git a/zq-erp/src/main/resources/templates/views/admin/activity/activity-sign.html b/zq-erp/src/main/resources/templates/views/admin/activity/activity-sign.html
index db15444..90ce701 100644
--- a/zq-erp/src/main/resources/templates/views/admin/activity/activity-sign.html
+++ b/zq-erp/src/main/resources/templates/views/admin/activity/activity-sign.html
@@ -531,7 +531,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