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

Helius

2021-04-16 949e7e46086e034d747746d2b450d7c262c9a594

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

@@ -116,7 +116,7 @@
    @GetMapping(value = "/clickSign")
    @ResponseBody
    @Transactional
    public AjaxResult clickSign(@PathVariable("couponId") long actId) {
    public AjaxResult clickSign(@PathVariable("actId") long actId) {
        SysVipInfo user = redisUserLoginUtils.getLoginUser(SysVipInfo.class);
        Long userId = user.getId();
        Long companyId = user.getCompanyId();