Merge remote-tracking branch 'gitbit/gzynwcs' into gzynwcs

tqs

2022-10-12 e828d99f25ba6736cdb0c31128aa4d976348bcb3

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

@@ -195,6 +195,9 @@
    @TableField("pack_status")
    private Integer packStatus;

    @ApiModelProperty(value= "通道")
    private Integer channel;

    public String getIoTime$(){
        if (Cools.isEmpty(this.ioTime)){
            return "";
@@ -312,8 +315,10 @@
            case 2:
                return "测试中";
            case 3:
                return "静置中";
                return "测试完成";
            case 4:
                return "静置中";
            case 5:
                return "静置完成";
            default:
                return String.valueOf(this.packStatus);