Merge branch '2.0-master' into 2.0-dev

hai-service/src/main/java/com/hai/model/UserModel.java

@@ -47,6 +47,14 @@ public class UserModel {
     // 油卡信息
     private Map<String, Object> oilCard;
 
+    public Integer getBlxCouponBalance() {
+        return blxCouponBalance;
+    }
+
+    public void setBlxCouponBalance(Integer blxCouponBalance) {
+        this.blxCouponBalance = blxCouponBalance;
+    }
+
     public Boolean getIsSetOilCard() {
         return isSetOilCard;
     }