Merge remote-tracking branch 'origin/master'

nickchange

2023-11-15 331ae50b1cdcb31a4a0c182abb82aec5c1b12f83

 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;
}