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

weimingfei

3 天以前 9958c9393c8c3a5e2350fa9023e14cbbf74b0d9a

 server/system_service/src/main/java/com/doumee/core/utils/Constants.java

@@ -790,7 +790,7 @@
                String t = reversedHex.substring(i*2,i*2+2);
                result += new StringBuilder(t).reverse().toString();
            }
            return result;
            return result.toUpperCase();
        }catch (Exception e){

        }
@@ -1194,7 +1194,7 @@
        IN_CITY_CAR_USE(3, "公车市内用车 ", "公车市内用车 "),
        OUT_CITY_CAR_USE(4, "公车室外用车 ", "公车室外用车 "),
        CITY_WLC_BOOK(5, "市公司物流车预约 ", "5市公司物流车预约 "),
        PLATFROM_REASON(6, "月台入园原因审批 ", "月台入园原因审批 "),
        PLATFROM_REASON(6, "月台入园原因审批 ", "月台入园原因审批 ")
        ;
        // 成员变量
        private String name;
@@ -1523,9 +1523,9 @@


    public  enum WarningConfig {
        ALARM_TEST(10002, "酒精测试"),
        GRID_TIME_OUT_INFO(10003, "开门超时未关闭"),
        KEY_TIME_OUT_BACK(10004, "钥匙超时未归还"),
        ALARM_TEST(10002, "【钥匙柜】酒精测试异常"),
        GRID_TIME_OUT_INFO(10003, "【钥匙柜】开门超时未关闭"),
        KEY_TIME_OUT_BACK(10004, "【钥匙柜】钥匙超时未归还"),
        ;
        // 成员变量
        private int key;