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

zhanghl

2025-05-16 a5c145b5b9afb665d3130bbcf8659ee1a4b15ebf

 aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlanCycle.java

@@ -60,6 +60,7 @@
    /** 计划ID */
    @Excel(name = "计划ID")
    @Schema(description = "计划ID")
    @JsonFormat(shape = JsonFormat.Shape.STRING)
    private Long planId;

    public void setType(String type)