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

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/manage/GoblinStoreMgtDigitalGoodsAddSkuParam.java

@@ -62,9 +62,9 @@ public class GoblinStoreMgtDigitalGoodsAddSkuParam implements Serializable {
 //    @NotNull(message = "线上库存不能为空")
     @Min(value = 0, message = "线上库存必须大于0")
     private Integer stock;
-    @ApiModelProperty(position = 22, required = false, value = "概率[0.01~100%]，`unbox=1`时有效", example = "0")
-    @DecimalMin(value = "0", message = "概率超出可填范围0.01~100")
-    @DecimalMax(value = "100", message = "概率超出可填范围0.01~100")
+    @ApiModelProperty(position = 22, required = false, value = "盲盒命中率[0.00~100%]，0标识不参与盲盒，null标识均摊，`unbox=1`时有效", example = "0")
+    @DecimalMin(value = "0", message = "概率超出可填范围0.00~100")
+    @DecimalMax(value = "100", message = "概率超出可填范围0.00~100")
     private BigDecimal hitRatio;
     @ApiModelProperty(position = 23, required = true, value = "藏品价格[20,2]", example = "0.01")
     @NotNull(message = "藏品价格不能为空")

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinGoodsSkuInfoVo.java

@@ -47,7 +47,7 @@ public class GoblinGoodsSkuInfoVo implements Serializable, Cloneable {
     private Integer stock;
     @ApiModelProperty(position = 18, value = "单品库存")
     private Integer skuStock;
-    @ApiModelProperty(position = 18, value = "盲盒命中率[0.01~100%]")
+    @ApiModelProperty(position = 18, value = "盲盒命中率[0.01~100%]0标识不参与盲盒，null标识均摊")
     private BigDecimal hitRatio;
     @ApiModelProperty(position = 19, value = "预警库存")
     private Integer warningStock;

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/docu/db_0315_jxl_nft.sql

@@ -28,7 +28,7 @@ alter table goblin_goods_sku add sale_stop_time datetime null comment '停售时
 alter table goblin_goods_sku add soldout_status char default '0' not null comment '是否售罄[0-否|1-是]' after shelves_status;
 alter table goblin_goods_sku add sku_canbuy char null comment '是否购买[0-否|1-是]' after sku_appear;
 alter table goblin_goods_sku add unbox char default '0' not null null comment '是否盲盒[0-否|1-是]' after sku_canbuy;
-alter table goblin_goods_sku add hit_ratio decimal(8, 2) null comment '盲盒命中率[0.01~100%]' after unbox;
+alter table goblin_goods_sku add hit_ratio decimal(8, 2) null comment '盲盒命中率[0.00~100%]，0标识不参与盲盒，null标识均摊' after unbox;
 alter table goblin_goods_sku add opening_time datetime null comment '盲盒开启时间' after hit_ratio;
 alter table goblin_goods_sku add opening_limit int default 0 comment '盲盒开启时限[单位秒]' after opening_time;