Merge remote-tracking branch 'origin/master'

src/main/java/com/yx/face/service/impl/FaceServiceImpl.java

@@ -522,7 +522,7 @@ public class FaceServiceImpl implements FaceService {
     public String getLogo(Integer adminId) {
         FaceDeviceLogo faceDeviceLogo = faceDeviceLogoDao.selectList(adminId);
         if (faceDeviceLogo == null) {
-            faceDeviceLogo.setLogoImg("");
+            return "";
         }
         return faceDeviceLogo.getLogoImg();
     }