Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QianYunTong

liujie

7 天以前 729a5a0592cac7750e8b476c5fcb25bfc3ff8d25

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Phone.java

@@ -36,6 +36,11 @@
     */
    @TableField("companyId")
    private Integer companyId;
   /**
    * 开通城市id
    */
   @TableField("openCityId")
   private Integer openCityId;

    public Integer getId() {
        return id;
@@ -77,6 +82,14 @@
        this.companyId = companyId;
    }

   public Integer getOpenCityId() {
      return openCityId;
   }
	
   public void setOpenCityId(Integer openCityId) {
      this.openCityId = openCityId;
   }
	
    @Override
    public String toString() {
        return "Phone{" +