Merge remote-tracking branch 'origin/master'

jiangping

2024-12-20 53b6400ec10c8ca61ccec91c82c358d2488eead8

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformBooks.java

@@ -65,8 +65,8 @@
    @ExcelColumn(name="入库类型",index = 7,width = 12,valueMapping = "0=整托盘;1=件烟;")
    private Integer inType;

    @ApiModelProperty(value = "总运输量", example = "1")
    @ExcelColumn(name="总运输量",index = 2,width = 12)
    @ApiModelProperty(value = "总作业量(万支)", example = "1")
    @ExcelColumn(name="总作业量(万支)",index = 2,width = 12)
    private BigDecimal totalNum;

    @ApiModelProperty(value = "前车牌号")
@@ -97,6 +97,8 @@
    @ApiModelProperty(value = "入园原因")
    @ExcelColumn(name="入园原因",index = 1,width = 12)
    private String inReason;



    @ApiModelProperty(value = "入园原因主键")
    private Integer reasonId;
@@ -139,6 +141,11 @@
    @TableField(exist = false)
    private String auditTime;

    @ApiModelProperty(value = "通知描述")
    @TableField(exist = false)
    private String info;


    @ApiModelProperty(value = "审批信息数据")
    @TableField(exist = false)
    private ApproveDataVO approveDateVO;