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

xiaoyong931011

2021-04-07 382c853bb36bc2521818058c788b6fdf48d7f684

 zq-erp/src/main/java/com/matrix/system/hive/bean/AchieveNew.java

@@ -80,6 +80,8 @@
    */
   private Double  goodsCash;
   
   private Double cardCash;
	
   /**
    * 赠送消耗
    */
@@ -247,6 +249,14 @@

   private String cateName;

   public Double getCardCash() {
      return cardCash;
   }

   public void setCardCash(Double cardCash) {
      this.cardCash = cardCash;
   }

   public String getCateName() {
      return cateName;
   }