add

GIGA/Modules/Me/Model/GIGaFeedKind.h

@@ -11,5 +11,7 @@
 @interface GIGaFeedKind : JSONModel
 @property (nonatomic,copy) NSString *feed_id;
 @property (nonatomic,copy) NSString *remarks;
+@property (nonatomic,copy) NSString *dictLabel;
+@property (nonatomic,copy) NSString *dictCode;
 
 @end

GIGA/Modules/Me/Model/MaskHistryRecord.h

@@ -0,0 +1,40 @@
+//
+//  MaskHistryRecord.h
+//  GIGA
+//
+//  Created by lianxiang on 2018/9/25.
+//  Copyright © 2018年 com.giga.ios. All rights reserved.
+//
+
+#import <JSONModel/JSONModel.h>
+//@class MaskHistryRecordlist;
+
+@interface MaskHistryRecord : JSONModel
+@property(nonatomic,copy) NSString  *reocrd_id;
+@property(nonatomic,copy) NSString  *memberId;
+@property(nonatomic,copy) NSString  *skinType;
+@property(nonatomic,copy) NSString  *minute;
+@property(nonatomic,copy) NSString  *beginTime;
+@property(nonatomic,copy) NSString  *endTime;
+@property(nonatomic,copy) NSString  *dayNum;
+@property(nonatomic,copy) NSString  *num;
+@property(nonatomic,copy) NSString  *finishNum;
+@property(nonatomic,copy) NSString  *finishStatus;
+@property(nonatomic,copy) NSString  *useDate;
+@property(nonatomic,copy) NSString  *createTime;
+@property(nonatomic,copy) NSString  *updateTime;
+@property(nonatomic,copy) NSString  *skinTypeName;
+
+@end
+
+@protocol MaskHistryRecord;
+
+@interface MaskHistryRecordlist:JSONModel
+@property(nonatomic) NSInteger totalCount;
+@property(nonatomic) NSInteger pageSize;
+@property(nonatomic) NSInteger totalPage;
+@property(nonatomic) NSInteger currPage;
+@property(nonatomic) NSArray <MaskHistryRecord> *list;
+@property(nonatomic,copy) NSString *ruleUrl;
+
+@end

GIGA/Modules/Me/Model/MaskHistryRecord.m

@@ -0,0 +1,36 @@
+//
+//  MaskHistryRecord.m
+//  GIGA
+//
+//  Created by lianxiang on 2018/9/25.
+//  Copyright © 2018年 com.giga.ios. All rights reserved.
+//
+
+#import "MaskHistryRecord.h"
+
+
+@implementation MaskHistryRecord
+
++(JSONKeyMapper *)keyMapper{
+    return [[JSONKeyMapper alloc] initWithModelToJSONDictionary:@{@"reocrd_id":@"id"}];
+}
+
++ (BOOL)propertyIsOptional:(NSString *)propertyName{
+    
+    return YES;
+}
+
+@end
+
+@implementation MaskHistryRecordlist
+
+//+(JSONKeyMapper *)keyMapper{
+//    return [[JSONKeyMapper alloc] initWithModelToJSONDictionary:@{@"reocrd_id":@"id"}];
+//}
+
++ (BOOL)propertyIsOptional:(NSString *)propertyName{
+    
+    return YES;
+}
+
+@end