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

jyy

2021-04-20 fa791f7796c1546b1329b52a3de8d753915cb4d5

 zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShopActivitiesSignAction.java

@@ -263,7 +263,8 @@
           activitySignReceiveRecord.setUpdateBy(user.getVipName());
           activitySignReceiveRecord.setUpdateTime(new Date());
           activitySignReceiveRecordDao.insert(activitySignReceiveRecord);
        	

            signSuccessVo.setScoreCnt(activitySignAwardSetNormal.getScoreCnt());
           signSuccessVo.setNormalAwardName(activitySignAwardSetNormal.getAwardName());
           signSuccessVo.setNormalAwardImg(activitySignAwardSetNormal.getIntroduceImg());
        }