Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into sc...

xiaoyong931011

2021-03-12 26ffb618e472c3681f17b8b1b1a19ea55383928c

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

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

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