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

mec-biz/src/main/java/com/ym/mec/biz/service/impl/SellOrderServiceImpl.java

@@ -142,6 +142,7 @@ public class SellOrderServiceImpl extends BaseServiceImpl<Integer, SellOrder> im
                 sellOrder.setStockType(goodsStockType);
             }
             //批次号 TODO
+            //goodsService.subtractStock();
 
             sellOrders.add(sellOrder);
             i++;

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

@@ -5,8 +5,8 @@
         <!--@Table sys_payment_config-->
         <id column="id_" jdbcType="INTEGER" property="id"/>
         <result column="organ_id_" property="organId"/>
-        <result column="account_tyoe_" property="accountType"/>
-        <result column="pay_type_" property="payType"/>
+        <result column="account_type_" property="accountType" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+        <result column="pay_type_" property="payType" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="yq_mer_no_" property="yqMerNo"/>
         <result column="hf_mer_no_" property="hfMerNo"/>
         <result column="type_" property="type"/>