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

jyy

2021-01-28 83571cf68bc955b8b804d3402331d1ba7f2f4e6c

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

@@ -570,4 +570,6 @@

    String SEX_MAN ="男";
    String SEX_WOMAN ="女";

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