Merge remote-tracking branch 'origin/dev' into dev

xiangpei

2024-07-11 5073a245f53fd5ca936e779be8c6b9b19d42f67d

 src/main/java/com/ycl/jxkg/context/WxContext.java

@@ -1,7 +1,7 @@
package com.ycl.jxkg.context;

import com.ycl.jxkg.domain.User;
import com.ycl.jxkg.domain.UserToken;
import com.ycl.jxkg.domain.entity.User;
import com.ycl.jxkg.domain.entity.UserToken;
import org.springframework.stereotype.Component;
import org.springframework.web.context.request.RequestAttributes;
import org.springframework.web.context.request.RequestContextHolder;