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

skyouc

2 天以前 8570b32ed879dbe625b58d31c6ed04288cd9d476

 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;