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

zhanghl

2025-04-23 ab0b4b2397c46701e372a49cf8ff4d268bb577b3

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

@@ -30,7 +30,7 @@

    /** 工序序号 */
    @Excel(name = "工序序号")
    private Long processNumber;
    private String processNumber;

    /** 工序名称 */
    @Excel(name = "工序名称")
@@ -105,12 +105,12 @@
        return workOrderNo;
    }

    public void setProcessNumber(Long processNumber) 
    public void setProcessNumber(String processNumber)
    {
        this.processNumber = processNumber;
    }

    public Long getProcessNumber() 
    public String getProcessNumber()
    {
        return processNumber;
    }