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

无关风月

1 天以前 2b2e8603381d62b5da4a817710b33d583561ff3f

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/Store.java

@@ -69,6 +69,9 @@
     */
    @TableField("cityCode")
    private String cityCode;
    @TableField("operatorId")
    private Integer operatorId;

    /**
     * 联系电话
     */