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

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

@@ -23,6 +23,7 @@
         LEFT JOIN sys_clients_devices d ON t.dev_id = d.dev_id
         WHERE
         	t.client_id = #{client_id}
+        	 and client_type is not null
         GROUP BY
         	token
     </select>