bug

src/main/java/org/springblade/modules/system/service/impl/UserMerchantServiceImpl.java

@@ -47,6 +47,9 @@ public class UserMerchantServiceImpl extends ServiceImpl<UserMerchantMapper, Use
 	@Override
 	public UserMerchantVO getByUserId(Long userId) {
 		UserMerchant one = getOne(Wrappers.lambdaQuery(UserMerchant.class).eq(UserMerchant::getUserId, userId));
+		if (Objects.isNull(one)){
+			return new UserMerchantVO();
+		}
 		return UserMerchantWrapper.build().entityVO(one);
 	}