Merge branch 'api' into order_reform

Helius

2021-01-12 a88cf964159303c208d8a3a9d0b8dadef7b1388a

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

@@ -558,5 +558,8 @@

   String ORDER_TYPE_SEAL="订单";
   String ORDER_TYPE_SERVICE="服务单";

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