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

jyy

2021-03-15 53939e0ceb528f45c4906c86ce499ecb864f7af8

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

@@ -55,10 +55,7 @@
    * 支付方式-现金支付
    */
   String PAY_TYPE_MOENY = "现金";
   /**
    * 支付方式-现金支付
    */
   String PAY_TYPE_MOENY_CARD = "会员卡";

   /**
    * 支付方式-卡支付
    */