Merge remote-tracking branch 'origin/jxhcasrs' into jxhcasrs

lty

20 小时以前 01fa93b5dd9f20286ef8f22515caf55307f76a9d

 src/main/java/com/zy/asrs/enums/CommonEnum.java

@@ -9,9 +9,9 @@
public enum CommonEnum {

    //通用类型
    COMMON_ENUM_Y(0, "否"),
    COMMON_ENUM_Y(1, "是"),
    //通用
    COMMON_ENUM_N(1, "是");
    COMMON_ENUM_N(0, "否");

    public Integer type;