Merge branch 'score_shop' into api_score_meger

jyy

2021-09-03 b687aa0f371e12d4ec1813f18a4f889e8f825f67

 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>