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

奖品库回收开关

See merge request quanshu/mp-server!987

mp-service/src/main/java/com/qs/mp/user/domain/vo/UserPrizeStorageVO.java

@@ -16,7 +16,7 @@ import java.math.BigDecimal;
  * @author Cup
  * @date 2022/5/24
  */
-@ApiModel("用户事务奖品库出参类")
+@ApiModel("用户实物奖品库出参类")
 @Data
 public class UserPrizeStorageVO extends UserPrizeStorage {
 
@@ -33,4 +33,8 @@ public class UserPrizeStorageVO extends UserPrizeStorage {
     @ApiModelProperty("盲票形式（线上或线下）")
     @JSONField(serialzeFeatures = SerializerFeature.WriteEnumUsingToString)
     private TicketTypeEnum type;
+
+
+    @ApiModelProperty("回收开关")
+    private boolean recovery = true;
 }