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

xiangpei

2025-06-04 4e502853119c6d8e7ff686191e19bb0a19a4f875

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

@@ -85,6 +85,8 @@
    /** 报名人员集合*/
    private List<MemberVO> members;

    private Boolean isReport;

    public static ActivityVO getVoByEntity(@NonNull Activity entity, ActivityVO vo) {
        if(vo == null) {
            vo = new ActivityVO();