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

无关风月

7 天以前 4f5d220cd175b1cb48c6fc91cb02cb12f6114746

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

@@ -134,6 +134,10 @@
    @TableField("operatorId")
    private Integer operatorId;

    @TableField(exist = false)
    private String oName;

    private String ids;

    @Override
    protected Serializable pkVal() {