Merge remote-tracking branch 'origin/master'

xuhy

4 天以前 851aa3d5d8bc4920a86ea683198f736a043213b5

 ruoyi-system/src/main/java/com/ruoyi/system/service/TAppUserLocationService.java

@@ -1,10 +1,7 @@
package com.ruoyi.system.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.system.model.TAppUserLocation;
import com.ruoyi.system.model.TMajor;
import com.ruoyi.system.query.TMajorQuery;

/**
 * <p>