Merge remote-tracking branch 'origin/lfdasrs-sxkVersion' into lfdasrs-sxkVe...

zwl

2025-03-31 57c109f4c962659e7a8f17ef4cd6b00a551e30ad

 src/main/java/com/zy/asrs/entity/WaitPakinLog.java

@@ -120,7 +120,7 @@
    private Integer source;

    @ApiModelProperty(value= "要求检验 1: 是  0: 否  ")
    private Integer check;
    private Integer inspect;

    @ApiModelProperty(value= "危险品 1: 是  0: 否  ")
    private Integer danger;
@@ -177,15 +177,15 @@
        }
    }

    public String getCheck$(){
        if (null == this.check){ return null; }
        switch (this.check){
    public String getInspect$(){
        if (null == this.inspect){ return null; }
        switch (this.inspect){
            case 1:
                return "是";
            case 0:
                return "否";
            default:
                return String.valueOf(this.check);
                return String.valueOf(this.inspect);
        }
    }