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

jyy

2021-05-22 3e85a137adb035e4808e95edf7017f7f204900d9

 zq-erp/src/main/java/com/matrix/system/shopXcx/api/vo/SeeAwardTextVo.java

@@ -51,7 +51,7 @@
   @ApiModelProperty(value ="客服电话")
   private String  customerPhone ;

   @ApiModelProperty(value =" 状态(1:待兑换 2:待发货  3:已兑换  )")
   @ApiModelProperty(value =" 是否已领取（1：待领取2:已领取 3：待配送 4：待收货 5:已失效）")
   private Integer  state;

   /**