Merge branch 'dev' of ssh://10.10.100.21/source/saas-platform into dev

applications/money/money-server/src/main/resources/mapper/PaybalancedetMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.usoftchina.saas.money.mapper.PaybalancedetMapper" >
   <resultMap id="BaseResultMap" type="com.usoftchina.saas.money.po.Paybalancedet" >
-    <id column="pd_id" property="pdId" jdbcType="INTEGER" />
+    <id column="pd_id" property="id" jdbcType="INTEGER" />
     <result column="pd_rbid" property="pdRbid" jdbcType="INTEGER" />
     <result column="pd_detno" property="pdDetno" jdbcType="INTEGER" />
     <result column="pd_ym" property="pdYm" jdbcType="INTEGER" />