~jiangyouyao/beauty-erp.git

			@@ -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>

			@@ -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>

	zq-erp/src/main/resources/templates/views/admin/activity/activity-sign-update.html	2 ●●●●● patch \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/activity/activity-sign.html	2 ●●●●● patch \| view \| raw \| blame \| history