Merge remote-tracking branch 'origin/master'

puzhibing

2024-01-03 168d852672f8f671a01d6f0f053349d0d321ec7c

 cloud-server-other/src/main/java/com/dsh/other/entity/Store.java

@@ -131,6 +131,14 @@
    private Integer state;


    @TableField("operatorId")
    private Integer operatorId;

    @TableField(exist = false)
    private String oName;

    private String ids;

    @Override
    protected Serializable pkVal() {
        return this.id;