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

mec-biz/src/main/java/com/ym/mec/biz/service/impl/AppRedemptionCodeServiceImpl.java

@@ -111,7 +111,7 @@ public class AppRedemptionCodeServiceImpl extends ServiceImpl<RedemptionCodeDao,
             return null;
         }
         redemptionCode.setUserId(userId);
-        int retCount = redemptionCodeDao.update(redemptionCode, new WrapperUtil<AppRedemptionCode>().queryWrapper());
+        int retCount = redemptionCodeDao.updateById(redemptionCode);
         if (retCount == 0) {
             return null;
         }

mec-web/src/main/java/com/ym/mec/web/controller/AppRedemptionCodeController.java

@@ -32,7 +32,7 @@ public class AppRedemptionCodeController extends BaseController {
     private SysUserFeignService sysUserFeignService;
 
     @ApiOperation(value = "分配url")
-    @PostMapping(value = "allocation")
+    @GetMapping(value = "allocation")
     @PreAuthorize("@pcs.hasPermissions('appRedemptionCode/allocation')")
     public HttpResponseResult<AppRedemptionCode> allocation(@RequestParam("userId")Integer userId) throws Exception {
         if (userId == null) {