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

zhanghl

2025-04-29 43b3006894adb07e968ba4d23b2542b791d2b5bf

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

@@ -61,8 +61,8 @@
    private BigDecimal processTotalTime;

    /** 计划开工日 */
    @Excel(name = "计划开工日")
    @Schema(description = "计划开工日", type = "Date")
    @Excel(name = "计划开工日", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date processPlanStartDay;

    /** 设计工时 */