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

jyy

2021-04-21 4dfe83675fc23f4514b6c3cf44fcc84c7e0b52a8

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

@@ -17,7 +17,7 @@
   private String nickName;
   
   @ApiModelProperty(value = "签到时间")
   @JsonFormat(pattern = "yyyy-MM-dd", timezone="GMT+8")
   @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss", timezone="GMT+8")
   private Date reciveTime;
   
   @ApiModelProperty(value = "连续签到天数")