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

935090232@qq.com

2021-10-25 7af9aaa4ef6736d407cc3cbe03beddb8dfd57fe9

 zq-erp/src/main/java/com/matrix/system/activity/vo/SignWriteoffVo.java

@@ -39,7 +39,7 @@
   private int  state;
   
   @ApiModelProperty(value ="兑奖时间")
   @JsonFormat(pattern = "yyyy-MM-dd hh:mm", timezone="GMT+8")
   @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss", timezone="GMT+8")
   private Date  djsj;
   
   @ApiModelProperty(value ="收货人")