Merge branch 'api' into hive2.0

jyy

2021-01-25 949efdc17fa833f6511c0e5902057f3be0fe72c4

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

@@ -567,5 +567,7 @@

   String ACHIEVE_TYPE_CASH = "现金业绩";
   String ACHIEVE_TYPE_CARD = "划扣业绩";
	

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