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

935090232@qq.com

2021-01-17 31b85d0135090435438545ece57142d62f185224

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

@@ -63,6 +63,12 @@
    * 支付方式-卡支付
    */
   String PAY_TYPE_CARD = "划扣";


   /**
    * 服务单状态-待确认
    */
   String SERVICE_STATU_DQR = "待确认";
   /**
    * 服务单状态-待预约
    */