Merge remote-tracking branch 'origin/master'

fuliqi

2024-11-26 a272c80f565aa5ace23820558fdb7cde636d15f0

 business/src/main/java/com/ycl/domain/vo/PlanVO.java

@@ -42,14 +42,6 @@
    @ApiModelProperty("年度（0：已上报，1：未上报）")
    private Integer yearStatus;

    /** 创建时间 */
    @ApiModelProperty("创建时间")
    private Date gmtCreateTime;

    /** 修改时间 */
    @ApiModelProperty("修改时间")
    private Date gmtUpdateTime;

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