Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-10-23 c97b518d5fbb570817ca835e96c1b8aa49b099e1

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/util/GiveVipUtil.java

@@ -1,7 +1,6 @@
package com.ruoyi.account.util;

import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONArray;
import com.ruoyi.account.api.dto.SendCouponDto;
import com.ruoyi.account.api.model.TAppCoupon;
import com.ruoyi.account.api.model.TAppUser;