Merge remote-tracking branch 'origin/master'

doum

8 小时以前 59b1f0e9967902aa10f5e017d5a0bdfd1b60c9ea

 server/services/src/main/java/com/doumee/dao/business/model/ShopInfo.java

@@ -186,6 +186,9 @@
    @ApiModelProperty(value = "门店营业类型：0=非全天；1=全天", example = "0")
    private Integer businessType;

    @ApiModelProperty(value = "芯烨云打印机SN编号")
    private String printerSn;


    // 非持久化：附件列表
    @TableField(exist = false)