Merge remote-tracking branch 'origin/master'

zhangherong

8 天以前 1337e62c126ddb7eb1088c4d81a721cf7cc2d7c4

 lxzn-boot-base-core/src/main/java/org/jeecg/common/constant/CommonConstant.java

@@ -366,6 +366,12 @@
    String YN_Y = "Y";
    String YN_N = "N";

    /**
     * 1是0否
     */
    String YN_O = "0";
    String YN_1 = "1";


    /**===============================================================================================*/
    /**
@@ -572,4 +578,30 @@
     */
    String DICT_USER_FIRST_LOGIN = "user_first_login";

    /**
     * 设备运行转速范围字典编号
     */
    String DICT_OPERATING_SPEED_RANGE = "operating_speed_range";

    /**
     * 利用率判定间隔字典编号
     */
    String DICT_EQUIPMENT_RATE_JUDGE = "equipment_rate_judge";

    /**
     * 设备状态判断间隔字典编号
     */
    String DICT_EQUIPMENT_SPEED_JUDGE = "equipment_status_judge";

    /**
     * 利用率正常值字典编号
     */
    String DICT_EQUIPMENT_RATE_NORMAL = "equipment_rate_normal";

    /**
     * 加班数据 自动计算标识 1(是) 2(否)
     */
    Integer AUTO_FLAG_Y = 1;
    Integer AUTO_FLAG_N = 2;

}