Merge branch 'dev' of http://192.168.50.149:8085/r/aps-backend into dev

sfd

2025-05-23 50cf972c100b28e368590b07c33e5f78c20475d0

 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)