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

sfd

2025-05-21 da8559d4b6abaefabf394d1d2174b3bf4a545a89

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

@@ -27,6 +27,7 @@


    @Id
    @JsonFormat(shape = JsonFormat.Shape.STRING)
    private Long id;

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

    public void setType(String type)