Merge branch 'master' of http://118.89.139.230:10101/r/powerIntelligenceSystem

whyclxw

1 天以前 c7795eb09f3059f1a0310bc817e2fa0e9e64d29e

 src/main/java/com/whyc/util/CommonUtil.java

@@ -3,6 +3,7 @@
import com.whyc.constant.YamlProperties;
import com.whyc.pojo.db_user.User;
import com.whyc.service.UserLogService;
import org.apache.poi.ss.formula.functions.T;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.subject.Subject;
import org.springframework.beans.factory.annotation.Autowired;
@@ -20,6 +21,7 @@
@Component
public class CommonUtil {

    public static Object nullObject = null;
    private static UserLogService userLogService;

    @Autowired