Merge remote-tracking branch 'origin/master'

web/src/main/java/com/jpsoft/employment/modules/base/controller/WishInfoUserRecordController.java

@@ -232,8 +232,8 @@ public class WishInfoUserRecordController {
                     //如果更改为取消状态，需要修改心愿数量和已兑换数量
                     WishInfo wishInfo = wishInfoService.get(wishInfoUserRecord.getWishInfoId());
                     if(wishInfo!=null){
-                        int amount = wishInfo.getAmount() + 1;
-                        wishInfo.setAmount(amount);
+                        int amount = wishInfo.getRemainingAmount() + 1;
+                        wishInfo.setRemainingAmount(amount);
                         wishInfo.setUpdateBy(subject);
                         wishInfo.setUpdateTime(new Date());
                         wishInfoService.update(wishInfo);