Merge branch 'dev' into 'mp-server-test'

放入奖品库合并

See merge request quanshu/mp-server!288

mp-service/src/main/java/com/qs/mp/user/service/impl/UserExchangeOrderServiceImpl.java

@@ -114,7 +114,6 @@ public class UserExchangeOrderServiceImpl extends ServiceImpl<UserExchangeOrderM
       userPrizeStorageService.save(userPrizeStorage);
     } else {
       UserPrizeStorage userPrizeStorage = userPrizeStorageList.get(0);
-      userPrizeStorage.setGoodsNum(userPrizeStorage.getGoodsNum() + orderNum);
       boolean rtn = userPrizeStorageService.update(new LambdaUpdateWrapper<UserPrizeStorage>()
           .set(UserPrizeStorage::getGoodsNum, userPrizeStorage.getGoodsNum() + orderNum)
           .eq(UserPrizeStorage::getStorageId, userPrizeStorage.getStorageId()));