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

无关风月

2 天以前 3044a637a15e09d50ad733fd482c6e64e90df2f9

 ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/Prize.java

@@ -39,4 +39,8 @@
    @TableField("probability")
    private String probability;

    @ApiModelProperty("类型 1=补贴金 2=奖品")
    @TableField("prize_type")
    private Integer prizeType;

}