Merge branch 'hotfix' into develop

# Conflicts:
#	src/main/java/au/com/royalpay/payment/manage/application/web/SimpleClientApplyController.java

src/main/java/au/com/royalpay/payment/manage/mappers/system/MailSendMapper.java

@@ -26,4 +26,4 @@ public interface MailSendMapper {
 
     @AutoSql(type = SqlType.SELECT)
     JSONObject find(@Param("id") String id, @Param("mail_address")String mail_address);
-}
+}