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

fuliqi

2025-02-20 a1278f8b1edebde8114ca4add0f32d74495a835b

 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();