Merge branch 'score_shop' into api_score_meger

935090232@qq.com

2021-10-25 e3940d7c6d251167fd1eac3e3877c5c32153b7b0

 zq-erp/src/main/resources/templates/views/admin/hive/vip/question-form.html

@@ -41,7 +41,7 @@
                        th:data-url="@{/admin/dataDictionary/showDataDictionary}"
                        data-filed="name"
                        data-value="name"
                        data-param="{type:'字段类型'}"
                        data-param="{type:'问卷类型'}"
                        th:data-def="${obj?.type }"
                >
                    <option value="">--请选择字段类型--</option>