Merge branch 'score_shop' into api_score_meger

935090232@qq.com

2021-05-08 e53fcbe9fe844b7788b29c5106c1ac24d17c5535

 zq-erp/src/main/java/com/matrix/system/constance/Dictionary.java

@@ -569,4 +569,7 @@
    String SEX_WOMAN ="女";

    String[] COLORS = { "#57c5d2", "#e3565e", "#2f343a", "#4d98db", "#4fbc9d", "#be9d4c"};

    String SERVICE_OVER_BEGIN_END = "SERVICE_OVER_BEGIN_END";
    String SALE_MAN_IS_CONSUME_ACHIEVE = "SALE_MAN_IS_CONSUME_ACHIEVE";
}