Merge branch 'ww' into test

eladmin-system/src/main/java/cn/ysk/cashier/mybatis/rest/StorageController.java

@@ -2,6 +2,7 @@ package cn.ysk.cashier.mybatis.rest;
 
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.http.HttpUtil;
+import cn.ysk.cashier.annotation.Log;
 import cn.ysk.cashier.domain.QiniuContent;
 import cn.ysk.cashier.exception.BadRequestException;
 import cn.ysk.cashier.mybatis.entity.Activate;
@@ -46,6 +47,8 @@ public class StorageController {
         String userName  = SecurityUtils.getCurrentUsername();
         return new ResponseEntity<>(shopService.findActivate(shopId), HttpStatus.OK);
     }
+
+    @Log("修改活动数据")
     @PostMapping("/modityActivate")
     public ResponseEntity<Object> modityActivate(@RequestBody Activate activate){
         if (activate.getIsGiftPro() != null && activate.getIsGiftPro() == 1 && CollectionUtils.isEmpty(activate.getProducts()))