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

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

@@ -2,6 +2,8 @@ package au.com.royalpay.payment.manage.mappers.system;
 
 import com.alibaba.fastjson.JSONObject;
 
+import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 
 import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
@@ -20,5 +22,5 @@ public interface MailSendMapper {
     void update(JSONObject record);
 
     @AutoSql(type = SqlType.SELECT)
-    JSONObject find(String emailId, String contact_email);
+    JSONObject find(@Param("message_id") String message_id, @Param("mail_address")String mail_address);
 }