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

zxl

2025-02-19 e2edaf30f4bf2213fe55c9817980001a1ea23e9f

 ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CalculateReportVO.java

@@ -53,6 +53,10 @@
    /** 明细 */
    private List<CalculateRecordVO> recordList;

    private Integer whichYear;
    private Integer whichMonth;
    private Integer latestMonth;

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