Merge remote-tracking branch 'origin/master'

Pu Zhibing

2025-08-01 92480c7fd17a6bf89205ffcf4b78eef17988f0d5

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/warpper/OrderCrossCityWarpper.java

@@ -1,12 +1,7 @@
package com.stylefeng.guns.modular.crossCity.warpper;

import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import javafx.scene.chart.ValueAxis;

import java.util.Date;