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

mitao

2025-03-31 51f26723bee741bf112c8d0d965d0e2f2974bd04

 cloud-server-activity/src/main/java/com/dsh/activity/feignclient/other/model/Store.java

@@ -106,4 +106,11 @@
     */
    private Integer state;

    @TableField("operatorId")
    private Integer operatorId;

    @TableField(exist = false)
    private String oName;

    private String ids;
}