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

无关风月

3 天以前 e8f01399a49bb718f184e31d0f6de27c3dc64cef

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

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