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

liujie

6 天以前 729a5a0592cac7750e8b476c5fcb25bfc3ff8d25

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

@@ -22,6 +22,11 @@
    @TableField("companyId")
    private Integer companyId;
    /**
    * 开通城市id
    */
   @TableField("openCityId")
   private Integer openCityId;
   /**
     * 积分
     */
    @TableField("integral")
@@ -43,6 +48,14 @@
        this.companyId = companyId;
    }

   public Integer getOpenCityId() {
      return openCityId;
   }
	
   public void setOpenCityId(Integer openCityId) {
      this.openCityId = openCityId;
   }
	
    public Integer getIntegral() {
        return integral;
    }