update 广播信息中英翻译功能，用户个人中心apikey失效修改问题

m2pool-modules/m2pool-manage/src/main/resources/mapper/manage/ManageBroadcastMapper.xml

@@ -40,10 +40,22 @@
             amount,
             state
         FROM
-            wallet_inv2
-        WHERE
-            coin = #{coin}
-          AND `user` = #{user};
+            wallet_in
+        <where>
+            coin = #{coin} AND `user` = #{user}
+            <choose>
+                <when test="startDate != null and endDate != null">
+                    and `create_date` >= #{startDate} AND `create_date`<![CDATA[ <= ]]>  #{endDate}
+                </when>
+
+                 <otherwise>
+                    and `create_date` >= DATE_SUB(NOW(), INTERVAL 1 MONTH)
+                </otherwise>
+            </choose>
+
+
+        </where>
+
 
     </select>
     <select id="getHistoryBalance" resultType="com.m2pool.manage.dto.HistoryBalanceDto">
@@ -53,7 +65,8 @@
             user_account_balance uab
                 LEFT JOIN user_miner_account uma ON uab.ma_id = uma.id
         WHERE
-            uma.coin = #{coin} AND uma.miner_user=#{user} AND uab.status = 99
+            uma.coin = #{coin} AND uma.miner_user=#{user}
+        order by uab.status desc
     </select>
     <select id="getMiningUserInfo" resultType="com.m2pool.manage.dto.ManageMiningUserDto">
         SELECT
@@ -98,5 +111,17 @@
     <select id="getAllMinerUserByCoin" resultType="java.lang.String">
         select miner_user from  user_miner_account where coin = #{coin} and `user` = #{user} and status = 0;
     </select>
+    <select id="getListDataByPage" resultType="com.m2pool.manage.dto.ManageBroadcastDto">
+        SELECT
+            id,
+            content,
+            create_user as createUser,
+            update_user as updateUser,
+            update_time as updateTime,
+            create_time as createTime
+        FROM
+            manage_broadcast
+        where del =false
+    </select>
 
 </mapper>