Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-12-05 03331f46c05015df9debef834e752b2f9d13f9e0

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsServiceImpl.java

@@ -1,6 +1,5 @@
package com.ruoyi.other.service.impl;

import cn.hutool.json.JSONArray;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.account.api.feignClient.AppUserClient;