Merge branch 'master' of xwh/kmall-pt-general into master

kmall-admin/src/main/java/com/kmall/admin/entity/GoodsEntity.java

@@ -227,6 +227,26 @@ public class GoodsEntity implements Serializable {
     private String mychemId;
 
 
+    private String hsCode;
+
+    private String hsCodeName;
+
+    public String getHsCode() {
+        return hsCode;
+    }
+
+    public void setHsCode(String hsCode) {
+        this.hsCode = hsCode;
+    }
+
+    public String getHsCodeName() {
+        return hsCodeName;
+    }
+
+    public void setHsCodeName(String hsCodeName) {
+        this.hsCodeName = hsCodeName;
+    }
+
     public String getMychemId() {
         return mychemId;
     }

kmall-admin/src/main/resources/mybatis/mapper/GoodsDao.xml

@@ -72,6 +72,8 @@
         <result property="dailyPrice" column="daily_price"/>
         <result column="last_sale_time" property="lastSaleTime" jdbcType="TIMESTAMP"/>
         <result column="mychem_id" property="mychemId"/>
+        <result column="hs_code" property="hsCode"/>
+        <result column="hs_code_name" property="hsCodeName"/>
     </resultMap>
 
     <select id="queryObject" resultType="com.kmall.admin.entity.GoodsEntity">
@@ -609,7 +611,9 @@
             <if test="modTime != null">`mod_time` = #{modTime},</if>
             <if test="tstm != null">`tstm` = #{tstm},</if>
             <if test="lastSaleTime != null">`last_sale_time` = #{lastSaleTime},</if>
-            <if test="mychemId != null">`mychem_id` = #{mychemId}</if>
+            <if test="mychemId != null">`mychem_id` = #{mychemId},</if>
+            <if test="hsCode != null">`hs_code` = #{hsCode},</if>
+            <if test="hsCodeName != null">`hs_code_name` = #{hsCodeName}</if>
         </set>
         where id = #{id}
     </update>