Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev

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

@@ -149,6 +149,15 @@ public class UserModel {
         this.rechargeOrderNum = rechargeOrderNum;
     }
 
+
+    public Boolean getSetOilCard() {
+        return isSetOilCard;
+    }
+
+    public void setSetOilCard(Boolean setOilCard) {
+        isSetOilCard = setOilCard;
+    }
+
     public Long getWhetherCheckNum() {
         return whetherCheckNum;
     }