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

mitao

2025-04-11 8afc5bfc1e5df1e2f0a8872a344da3b3fd5d63b9

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/StoreConfig.java

@@ -58,6 +58,9 @@
    @TableField("backgroundImage")
    private String backgroundImage;

    @TableField("displayType")
    private Integer displayType;


    @Override
    protected Serializable pkVal() {