Merge branch 'developer'

姜友瑶

2022-06-13 6e35192ad8eb1f93a831fc6888e874344ecfd4eb

 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>