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

zhanghl

2025-05-07 a92b97225a0676c3645b72d8945542f7db2e05ae

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

@@ -16,7 +16,7 @@
    private static final long serialVersionUID = 1L;

    /** id */
    private Long id;
    private String id;

    /** 工厂名称 */
    @Excel(name = "工厂名称")
@@ -30,12 +30,12 @@
    @Excel(name = "启用状态")
    private String status;

    public void setId(Long id) 
    public void setId(String id)
    {
        this.id = id;
    }

    public Long getId() 
    public String getId()
    {
        return id;
    }