小版本上测试

src/main/java/com/caimei/www/pojo/baike/BaikeProduct.java

@@ -93,8 +93,7 @@ public class BaikeProduct implements Serializable {
     /**
      * 上市时间
      */
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    private Date marketTime;
+    private String marketTime;
     /**
      * 公司/厂商
      */
@@ -102,8 +101,7 @@ public class BaikeProduct implements Serializable {
     /**
      * NMPA认证时间
      */
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    private Date nmpaTime;
+    private String nmpaTime;
     /**
      * 适应人群
      */

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

@@ -112,7 +112,7 @@
             <div class="tr">
                 <div class="group">
                     <div class="th">上市时间</div>
-                    <div class="td" th:text="*{#dates.format(marketTime,'yyyy年MM月dd日')}"></div>
+                    <div class="td" th:text="*{marketTime}"></div>
                 </div>
                 <div class="group">
                     <div class="th">公司/厂商</div>
@@ -122,7 +122,7 @@
             <div class="tr">
                 <div class="group">
                     <div class="th">NMPA认证时间</div>
-                    <div class="td" th:text="*{#dates.format(nmpaTime,'yyyy年MM月dd日')}"></div>
+                    <div class="td" th:text="*{nmpaTime}"></div>
                 </div>
                 <div class="group">
                     <div class="th">价格区间</div>
@@ -214,13 +214,13 @@
             <div class="line"></div>
         </div>
         <div class="group">
-            <a th:href="*{ '/product-' + '4928.html' }" target="_blank" class="link">
+            <a th:href="*{ productLink }" target="_blank" class="link">
                 <img th:src="*{image}" th:alt="*{name}" class="image"/>
                 <span th:text="*{name}" class="name"></span>
             </a>
-            <a th:href="*{ '/supplier' + 111 + '.html' }" target="_blank" class="link">
-                <img th:src="*{image}" th:alt="*{name}" class="image"/>
-                <span th:text="*{name}" class="name"></span>
+            <a th:href="*{ '/supplier-' + shopId + '.html' }" target="_blank" class="link">
+                <img th:src="*{shopLogo}" th:alt="*{shopName}" class="image"/>
+                <span th:text="*{shopName}" class="name"></span>
             </a>
         </div>
     </section>

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

@@ -97,7 +97,7 @@
             <div class="tr">
                 <div class="group">
                     <div class="th">上市时间</div>
-                    <div class="td" th:text="*{#dates.format(marketTime,'yyyy年MM月dd日')}"></div>
+                    <div class="td" th:text="*{dates}"></div>
                 </div>
                 <div class="group">
                     <div class="th">供应商</div>
@@ -107,7 +107,7 @@
             <div class="tr">
                 <div class="group">
                     <div class="th">NMPA认证时间</div>
-                    <div class="td" th:text="*{#dates.format(nmpaTime,'yyyy年MM月dd日')}"></div>
+                    <div class="td" th:text="*{dates}"></div>
                 </div>
                 <div class="group">
                     <div class="th">价格区间</div>
@@ -197,13 +197,13 @@
             <div class="line"></div>
         </div>
         <div class="group">
-            <a href="/" target="_blank" class="link">
+            <a th:href="*{ productLink }" target="_blank" class="link">
                 <img th:src="*{image}" th:alt="*{name}" class="image"/>
                 <span th:text="*{name}" class="name"></span>
             </a>
-            <a href="/" target="_blank" class="link">
-                <img th:src="*{image}" th:alt="*{name}" class="image"/>
-                <span th:text="*{name}" class="name"></span>
+            <a th:href="*{ '/supplier-' + shopId + '.html' }" target="_blank" class="link">
+                <img th:src="*{shopLogo}" th:alt="*{shopName}" class="image"/>
+                <span th:text="*{shopName}" class="name"></span>
             </a>
         </div>
     </section>