Merge remote-tracking branch 'origin/developerA' into developerA

src/main/resources/templates/encyclopedia/instrument-detail.html

@@ -115,7 +115,7 @@
                     <div class="td" th:text="*{marketTime}"></div>
                 </div>
                 <div class="group">
-                    <div class="th">公司/厂商</div>
+                    <div class="th">供应商</div>
                     <div class="td" th:text="*{company}"></div>
                 </div>
             </div>
@@ -147,7 +147,7 @@
     <!-- 适应人群 -->
     <section class="section" th:if="*{adaptiveMan != ''}">
         <div class="title">
-            <h2>适应人群</h2>
+            <h2>适应症</h2>
             <div class="line"></div>
         </div>
         <div class="content" th:utext="*{adaptiveMan}"></div>
@@ -160,15 +160,15 @@
         </div>
         <div class="content" th:utext="*{unAdaptiveMan}"></div>
     </section>
-    <!-- 术前术后 -->
+    <!-- 注意事项 -->
     <section class="section" th:if="*{aroundOperation != ''}">
         <div class="title">
-            <h2>术前术后</h2>
+            <h2>注意事项</h2>
             <div class="line"></div>
         </div>
         <div class="content" th:utext="*{aroundOperation}"></div>
     </section>
-    <!-- 效果展示 -->
+    <!-- 效果展示
     <section class="section effect" th:unless="*{#arrays.isEmpty(displayImageList)}">
         <div class="title">
             <h2>效果展示</h2>
@@ -178,6 +178,7 @@
             <img th:src="${img}" th:each="img: *{displayImageList}"/>
         </div>
     </section>
+    -->
     <!-- 常见问题 -->
     <section class="section question" th:unless="*{#arrays.isEmpty(questionList)}">
         <div class="title">

src/main/resources/templates/encyclopedia/product-detail.html

@@ -145,7 +145,7 @@
         </div>
         <div class="content" th:utext="*{unAdaptiveMan}"></div>
     </section>
-    <!-- 术前术后 -->
+    <!-- 注意事项 -->
     <section class="section" th:if="*{ aroundOperation != '' }">
         <div class="title">
             <h2>注意事项</h2>