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

zhanghl

2025-05-21 d75541110d428f61a9fe3378110248b7dd78e240

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

@@ -49,6 +49,10 @@
    /** 焊接形式(hup\lod) */
    @Excel(name = "焊接形式")
    private String type;
    
    /** 适用工厂 */
    @Excel(name = "适用工厂")
    private String plant;

    /** 是否删除(0否，1是) */
    private Integer delFlag;