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

无关风月

8 天以前 4f5d220cd175b1cb48c6fc91cb02cb12f6114746

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

@@ -87,4 +87,9 @@
     * 状态（1=正常，2=冻结，3=删除）
     */
    private Integer state;
    /**
     * 运营商id
     */
    private Integer operatorId;

}