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

src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml

@@ -329,7 +329,7 @@
             remark3         = #{remark3,jdbcType=VARCHAR},
             price           = #{price,jdbcType=VARCHAR},
             manufactoryCode = #{manufactoryCode,jdbcType=VARCHAR},
-            supCode         = #{supCode,jdbcType=VARCHAR}
+            supCode         = #{supCode,jdbcType=VARCHAR},
             type         = #{type,jdbcType=VARCHAR}
         </set>
         where id = #{id,jdbcType=INTEGER}