Merge branch 'master-order' into dev

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/entity/ActivityProduct.java

@@ -111,7 +111,7 @@ public class ActivityProduct {
     /**
      * 说明
      */
-    private String explain;
+    private String explainInfo;
 
     @Transient
     List<ActivityProductSpecs> list;

xx-activity/xx-activity-server/src/main/resources/mapper/ActivityProductMapper.xml

 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.xxfc.platform.activity.mapper.ActivityProductMapper" >
-  <resultMap id="BaseResultMap" type="com.xxfc.platform.activity.entity.ActivityProduct" >
-    <!--
-      WARNING - @mbg.generated
-    -->
-    <id column="id" property="id" jdbcType="INTEGER" />
-    <result column="crt_time" property="crtTime" jdbcType="BIGINT" />
-    <result column="upd_time" property="updTime" jdbcType="BIGINT" />
-    <result column="name" property="name" jdbcType="VARCHAR" />
-    <result column="start_time" property="startTime" jdbcType="BIGINT" />
-    <result column="end_time" property="endTime" jdbcType="BIGINT" />
-    <result column="num_limit" property="numLimit" jdbcType="INTEGER" />
-    <result column="has_join_num" property="hasJoinNum" jdbcType="INTEGER" />
-    <result column="status" property="status" jdbcType="BIT" />
-    <result column="sort" property="sort" jdbcType="BIT" />
-    <result column="picture" property="picture" jdbcType="VARCHAR" />
-    <result column="type" property="type" jdbcType="BIT" />
-    <result column="time_type" property="timeType" jdbcType="BIT" />
-    <result column="is_del" property="isDel" jdbcType="BIT" />
-    <result column="specs_id" property="specsId" jdbcType="INTEGER" />
-    <result column="sales" property="sales" jdbcType="INTEGER" />
-    <result column="stock" property="stock" jdbcType="INTEGER" />
-    <result column="detail" property="detail" jdbcType="LONGVARCHAR" />
-    <result column="explain" property="explain" jdbcType="LONGVARCHAR" />
-  </resultMap>
 </mapper>
\ No newline at end of file