Merge branch 'score_shop' into api_score_meger

935090232@qq.com

2021-05-08 e53fcbe9fe844b7788b29c5106c1ac24d17c5535

 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>