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

xiangpei

2024-06-26 44aaa355ecf9430f8b182654d03c2914287bcba6

 src/main/java/com/ycl/jxkg/controller/wx/BaseWXApiController.java

@@ -1,8 +1,8 @@
package com.ycl.jxkg.controller.wx;

import com.ycl.jxkg.context.WxContext;
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.beans.factory.annotation.Autowired;

public class BaseWXApiController {