Merge remote-tracking branch 'origin/develop' into develop

src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TaskManualSettleMapper.xml

@@ -3,11 +3,11 @@
 <mapper namespace="au.com.royalpay.payment.manage.mappers.payment.TaskManualSettleMapper">
     <select id="getEveryLatestRecord" resultType="com.alibaba.fastjson.JSONObject">
        SELECT
-	        s.request_time,s.client_id,c.client_moniker
+	        s.request_time,c.client_id,c.client_moniker
         FROM
         	task_client_manual_settle s
-        left join sys_clients c on s.client_id = c.client_id
+        right join sys_clients c on s.client_id = c.client_id
-        where s.request_time=(select max(B.request_time) from task_client_manual_settle B where s.client_id =B.client_id)
+        where (s.request_time=(select max(B.request_time) from task_client_manual_settle B where s.client_id =B.client_id) or s.request_time is null)
         and c.manual_settle = 1
     </select>
 </mapper>