Merge remote-tracking branch 'origin/master'

Pu Zhibing

9 天以前 0b5d21c6338bb3bd094a5bf2379001c4e9772eb5

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IUserService.java

@@ -3,7 +3,6 @@
import com.baomidou.mybatisplus.service.IService;
import com.stylefeng.guns.core.datascope.DataScope;
import com.stylefeng.guns.modular.system.model.User;
import com.unionpay.upyzt.resp.MediaResp;
import org.apache.ibatis.annotations.Param;

import java.util.List;