Merge branch 'release/3.0' into dev/dev_xp

# Conflicts:
#	pom.xml
#	src/main/java/com/ai/da/common/utils/SendEmailUtil.java

src/main/java/com/ai/da/common/utils/SendEmailUtil.java

@@ -135,6 +135,7 @@ public class SendEmailUtil {
     private final static Long NOTIFICATION_CHINESE_TEMPLATE_ID = 122229L;
     private final static Long TRIAL_ORDER_LIST_ID = 122273L;
     private final static Long NO_TRIAL_ORDER_LIST_ID = 122591L;
+
     public static void sendCustomEmail(String receiverAddress, String senderAddress, TrialOrder trialOrder, int emailType, String country) {
         try {
             // 实例化一个认证对象
@@ -229,6 +230,7 @@ public class SendEmailUtil {
         }
     }
 
+
     public static void sendNoExcelEmail(String receiverAddress, String senderAddress) {
         try {
             // 实例化一个认证对象