Merge branch 'dev_v1.1.3_wh' of moapp/jyPoints into feature/v1.1.3

resourceBrushLibrary/entity/order.go

@@ -77,7 +77,7 @@ func OrderResourceRun(now time.Time, end int64) {
 				VipTime:      FormatDateByInt64(&l_vip_endtime, Date_Short_Layout),
 				Model:        3,
 			})
-			subpush_inactive := gconv.Int64(m["subpush_inactive"])
+			subpush_inactive := gconv.Int64(user["subpush_inactive"])
 			if subpush_inactive == 1 {
 				subpush_inactive = -1
 			}