Merge remote-tracking branch 'origin/hive2.0' into hive2.0

935090232@qq.com

2021-01-29 ac61bdd7a7f4834d35bf42a06bc766981f50211e

 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"};
}