解决冲突

doum

2026-03-06 34fe52caba63e6a6337cb9c3e6bd0d4707fd6a99

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/LargeScreenDataVO.java

@@ -25,5 +25,7 @@
    @ApiModelProperty(value = "二维码值")
    private String qrCode;

    @ApiModelProperty(value = "注意事项")
    private String attention;

}