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

zhou zhou

3 天以前 92ff7ea27e6f99c004c727d471f2f3d82c1c3a30

 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;