Merge branch 'bugfix' into test

src/components/preTreat/AddSimpleQuestion.vue

@@ -24,7 +24,7 @@
                     :sexType="dataPub.region7"
                     :type="dataPub.region2"
                     @pushValues="pushValues"
-                    :hasId="editData.id+''||''"
+                    :hasId="editData.id||''"
                     :options="editData.questionDetailList"></PubSelect>
             <div class="btn">
                 <el-button