Merge remote-tracking branch 'origin/task-lyh-21989' into test

src/main/java/com/fdkankan/ucenter/service/impl/MailTemplateServiceImpl.java

@@ -131,7 +131,7 @@ public class MailTemplateServiceImpl extends ServiceImpl<IMailTemplateMapper, Ma
             StringBuilder snCodes = new StringBuilder();
             for (Long cameraId : cameraMap.keySet()) {
                 if(cameraMap.get(cameraId) != null){
-                    snCodes.append(cameraMap.get(cameraId).getSnCode()).append("<br>");
+                    snCodes.append(cameraMap.get(cameraId).getWifiName()).append("<br>");
                 }
             }
             if(StringUtils.isBlank(snCodes)){