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

Pu Zhibing

昨天 2cf783a1480050c0f13907c5fde625edee8fce62

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/activity/ActivityServiceImpl.java

@@ -844,6 +844,7 @@
        activity.setActivityEndTime(now);
        activity.setUpdateTime(now);
        activity.setUpdateUserId(mgtBaseGetDto.getUserId());
        activity.setActivityStatus(2);
        this.updateById(activity);
        return R.ok();
    }