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

jyy

2021-01-25 124bbd56064fea49f51ac53f87acd3f974bcf744

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