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

src/main/java/com/uas/ps/inquiry/service/impl/PublicInquiryServiceImpl.java

@@ -97,7 +97,7 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
     /**
      * 消息推送短信模板id
      */
-    private final String SMS_TEMP_ID = "8cf71d56-09bb-4d60-993e-ed87ce72ec3b";
+    private final String SMS_TEMP_ID = "e14d502a-25b8-40a0-8acf-5c61ae38d763";
 
     /**
      * 消息推送方式：邮件、短信、im