Merge branch 'feature/v1.0.4_wky' of BaseService/powerCheckCenter into feature/v1.0.4

entity/power.go

@@ -34,9 +34,9 @@ type Free struct {
 	Apppushunread         int64 //已读未读
 	OjyLength             int64 //ojy的长度
 	Original              int64 //查看原文次数/每月
-	PPStatus              int   //省份订阅包状态
-	PPStartTime           int64 //省份订阅开始时间
-	PPEndTime             int64 //省份订阅到期时间
+	PpStatus              int   //省份订阅包状态
+	PpStartTime           int64 //省份订阅开始时间
+	PpEndTime             int64 //省份订阅到期时间
 }
 
 // 超级订阅相关

service/power.go

@@ -151,9 +151,9 @@ func (this *PowerService) Power(userid string, baseUserId, accountId, entId, pos
 					free.IsUpgrade = true //新免费用户
 				}
 				//省份订阅包
-				free.PPStatus = common.IntAll(o_jy["i_ppstatus"])
-				free.PPStartTime = common.Int64All(o_jy["l_areaStart_p"])
-				free.PPEndTime = common.Int64All(o_jy["l_areaEnd_p"])
+				free.PpStatus = common.IntAll(o_jy["i_ppstatus"])
+				free.PpStartTime = common.Int64All(o_jy["l_areaStart_p"])
+				free.PpEndTime = common.Int64All(o_jy["l_areaEnd_p"])
 				//超级订阅
 				vipStatus := common.Int64All((*data)["i_vip_status"])
 				vipStartTime := common.Int64All((*data)["l_vip_starttime"])