Merge branch 'develop-kjf' into develop

* develop-kjf:
  修复了股东大盘同步奖金池接口bug

kxs-stat/kxs-stat-biz/src/main/resources/mapper/KxsUserTradeMapper.xml

@@ -70,7 +70,7 @@
         select * from `${tableName}`
     </select>
     <select id="getStatAmount" resultType="java.math.BigDecimal">
-        select sum(pro_debit_trade_amt + pro_direct_trade_amt) from `${tableName}`
+        select sum(pro_debit_trade_amt + pro_direct_trade_amt) from `${tableName}` where user_id = 1 and del_flag != 1
     </select>
     <insert id="insertTempShdTableData">
         INSERT INTO `${tableName}`