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

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

@@ -6,7 +6,7 @@
     <result column="rd_rbid" jdbcType="INTEGER" property="rd_rbid" />
     <result column="rd_detno" jdbcType="INTEGER" property="rd_detno" />
     <result column="rd_ym" jdbcType="INTEGER" property="rd_ym" />
-    <result column="pb_date" property="pb_date" jdbcType="TIMESTAMP" />
+    <result column="rb_date" property="rb_date" jdbcType="TIMESTAMP" />
     <result column="rd_bankid" jdbcType="INTEGER" property="rd_bankid" />
     <result column="rd_bankcode" jdbcType="VARCHAR" property="rd_bankcode" />
     <result column="rd_bankname" jdbcType="VARCHAR" property="rd_bankname" />
@@ -127,7 +127,7 @@
       <if test="rd_detno != null">
         rd_detno,
       </if>
-      <if test="pb_date != null">
+      <if test="rb_date != null">
         rd_ym,
       </if>
       <if test="rd_bankid != null">
@@ -183,8 +183,8 @@
       <if test="rd_detno != null">
         #{rd_detno,jdbcType=INTEGER},
       </if>
-      <if test="pb_date != null">
-        CONVERT(date_format(#{pb_date,jdbcType=TIMESTAMP},'%Y%m'),SIGNED),
+      <if test="rb_date != null">
+        CONVERT(date_format(#{rb_date,jdbcType=TIMESTAMP},'%Y%m'),SIGNED),
       </if>
       <if test="rd_bankid != null">
         #{rd_bankid,jdbcType=INTEGER},
@@ -242,8 +242,8 @@
       <if test="rd_detno != null">
         rd_detno = #{rd_detno,jdbcType=INTEGER},
       </if>
-      <if test="pb_date != null">
-        rd_ym = CONVERT(date_format(#{pb_date,jdbcType=TIMESTAMP},'%Y%m'),SIGNED),
+      <if test="rb_date != null">
+        rd_ym = CONVERT(date_format(#{rb_date,jdbcType=TIMESTAMP},'%Y%m'),SIGNED),
       </if>
       <if test="rd_bankid != null">
         rd_bankid = #{rd_bankid,jdbcType=INTEGER},