Merge branch 'dev-hongbao'

admin

2019-01-03 5981b2cae7c20ec9021c8ccbe1a926f35f640210

 fanli/src/main/java/com/yeshi/fanli/mapping/hongbao/HongBaoV2Mapper.xml

@@ -22,7 +22,7 @@
      </association>

      <association property="parent" column="hb_pid"
         javaType="com.yeshi.fanli.entity.push.PushGoods">
         javaType="com.yeshi.fanli.entity.bus.user.HongBaoV2">
         <id column="hb_pid" property="id" jdbcType="BIGINT" />
      </association>

@@ -36,6 +36,17 @@
      <include refid="Base_Column_List" />
      from yeshi_ec_hongbao_v2 where hb_id = #{id,jdbcType=BIGINT}
   </select>
	
	
   <select id="listChildrenById" resultMap="BaseResultMap"
      parameterType="java.lang.Long">
      select
      <include refid="Base_Column_List" />
      from yeshi_ec_hongbao_v2 where hb_pid = #{0}
   </select>
	
	
	
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from
      yeshi_ec_hongbao_v2 where hb_id = #{id,jdbcType=BIGINT}</delete>
   <insert id="insert" parameterType="com.yeshi.fanli.entity.bus.user.HongBaoV2"