Merge branch 'dev-zrj' into 'staging'

店铺bug

See merge request !81

src/main/java/com/edgec/browserbackend/browser/repository/IpResourceRepository.java

@@ -37,7 +37,7 @@ public interface IpResourceRepository extends MongoRepository<IpResource, String
 
     List<IpResource> findByValidTimeBetweenAndIsDeleted(long beginTime, long endTime, boolean isDeleted);
 
-    IpResource findByShopIdAndIsDeleted(String shopId, boolean isDeleted);
+    IpResource findFirstByShopIdAndIsDeleted(String shopId, boolean isDeleted);
 
     int countByStatusAndIdInAndIsDeleted(int status, List<String> ipIds, boolean isDeleted);
 

src/main/java/com/edgec/browserbackend/browser/service/Impl/IpAndShopServiceImpl.java

@@ -65,7 +65,7 @@ public class IpAndShopServiceImpl implements IpAndShopService {
         if (ipResource == null)
             throw new ClientRequestException(BrowserErrorCode.IPNOTEXIST);
 
-        IpResource bind = ipResourceRepository.findByShopIdAndIsDeleted(shopId, false);
+        IpResource bind = ipResourceRepository.findFirstByShopIdAndIsDeleted(shopId, false);
         if (bind != null) {
             shopRequestDto.setShopId(shopId);
             shopRequestDto.setIpId(ipResource.getId());