Merge branch 'gzynasrs' of http://47.97.1.152:5880/r/zy-asrs into gzynasrs

18516761980

2022-08-18 9a6a85eecf1dd8489de45eb3ab804d3e33605be2

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

@@ -186,7 +186,7 @@
    @TableField("fire_status")
    private Integer fireStatus;

//    产品状态{0:无,1:待测,2:测试中;3.静置中;4:静置完成}
//    产品状态{0:无,1:待测,2:测试中;3.测试完成;4.静置中;5:静置完成}
    @ApiModelProperty(value= "")
    @TableField("pack_status")
    private Integer packStatus;
@@ -327,8 +327,10 @@
            case 2:
                return "测试中";
            case 3:
                return "静置中";
                return "测试完成";
            case 4:
                return "静置中";
            case 5:
                return "静置完成";
            default:
                return String.valueOf(this.packStatus);