Merge branch 'master' of http://182.151.8.209:9010/eln_TD/eln_web

src/views/business/study/comp/tbbd/Fh.vue

@@ -48,7 +48,7 @@
             <div class="line"></div>
             <div class="subtitle"> {{ $t('page.business.study.studyFormFill.jcgj') }}</div>
           </div>
-          <JcgjList ref="jcgjList" @handleQuery="getJjcgjList" />
+          <JcgjList ref="jcgjList" @handleQuery="getJjcgjList" :showXg="true"/>
 
           <pagination v-show="jcgjTotal > 0" small layout="prev, pager, next" :total="jcgjTotal"
             @pagination="getJjcgjList" />