冲突解决

Administrator

2018-11-09 0fc3ad6964436013152d08f6f67920b1f4fbcca2

冲突解决

 fanli/src/main/java/com/yeshi/fanli/entity/taobao/TaoBaoShopInfo.java

@@ -20,6 +20,9 @@
    private String pictureUrl;// 店铺图标

    private String shopUrl;// 店铺地址



    private String userType;// 店铺类型  1-天猫  0-淘宝()

	


    public TaoBaoShopInfo() {



    }

@@ -83,4 +86,12 @@
        this.shopUrl = shopUrl;

    }



    public String getUserType() {

        return userType;

    }



    public void setUserType(String userType) {

        this.userType = userType;

    }



}