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

pjb

2024-12-31 c4e8e814d2c9e0d03f6449860b70e58657fd7dc2

 src/main/java/com/zy/common/web/BaseController.java

@@ -16,6 +16,7 @@
import com.zy.system.service.UserLoginService;
import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;

import javax.servlet.http.HttpServletRequest;
@@ -26,6 +27,7 @@
/**
 * Created by vincent on 2019-09-09
 */
@Slf4j
public class BaseController extends AbstractBaseController {

    protected static final String RANGE_TIME_LINK = " - ";