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

peng

2025-10-11 8fd3db7778b3991810d33ac4dffd2f9031b106fc

 framework/src/main/java/cn/lili/modules/lmk/domain/vo/ScanPrizeVO.java

@@ -52,7 +52,6 @@
    @ApiModelProperty("是否启用")
    private String status;

    private String material;

    public static ScanPrizeVO getVoByEntity(@NonNull ScanPrize entity, ScanPrizeVO vo) {
        if(vo == null) {