Merge remote-tracking branch 'origin/master'

fei

3 天以前 68af47f24bc344d2e1c5e1a848458b38679ddad4

 zhang-content/src/main/java/com/ruoyi/domain/ZfEquipment.java

@@ -79,6 +79,8 @@

    private String url;

    private String fileName;

    @Excel(name = "是否注销",readConverterExp = "0=正常,1=已注销")
    private Integer status;