Merge branch 'master' of http://git.dayaedu.com/yonge/mec

mec-biz/src/main/resources/config/mybatis/SubjectChangeMapper.xml

@@ -41,6 +41,7 @@
         <result column="payment_channel_" property="paymentChannel"/>
         <result column="mer_no_" property="merNo"/>
         <result column="status_" property="status" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+        <result column="sell_time_" property="sellTime"/>
         <result column="create_time_" property="createTime"/>
         <result column="update_time" property="updateTime"/>
         <result column="version_" property="version"/>