bugfix

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

@@ -13,6 +13,6 @@ import java.util.List;
  */
 @Data
 public class BaikeType implements Serializable {
-    private Integer id;
+    private Integer typeId;
     private String name;
 }

src/main/resources/mapper/BaseMapper.xml

@@ -64,7 +64,7 @@
         where if(#{commodityType} = 1,productStatus,instrumentStatus) = 1
     </select>
     <select id="getBaikeTypeList" resultType="com.caimei.www.pojo.baike.BaikeType">
-        select id, name
+        select id as typeId, name
         from cm_baike_type
         where if(#{commodityType} = 1, typeSort = 1, typeSort = 2) and status = 1
         order by -sort desc,addTime desc