|
@@ -224,12 +224,6 @@ public class UserVipController extends BaseController {
|
|
|
if (subject4 != null) {
|
|
|
str += subject4.getTime() + "";
|
|
|
}
|
|
|
- if (spSubject1 != null) {
|
|
|
- str += spSubject1.getTime() + "";
|
|
|
- }
|
|
|
- if (spSubject4 != null) {
|
|
|
- str += spSubject4.getTime() + "";
|
|
|
- }
|
|
|
if (subject1Int != null) {
|
|
|
str += subject1Int + "";
|
|
|
}
|
|
@@ -242,6 +236,14 @@ public class UserVipController extends BaseController {
|
|
|
if (subject4Int != null) {
|
|
|
str += subject4Int + "";
|
|
|
}
|
|
|
+
|
|
|
+ //特训包
|
|
|
+ if (spSubject1 != null) {
|
|
|
+ str += spSubject1.getTime() + "";
|
|
|
+ }
|
|
|
+ if (spSubject4 != null) {
|
|
|
+ str += spSubject4.getTime() + "";
|
|
|
+ }
|
|
|
if (spSubject1Int != null) {
|
|
|
str += spSubject1Int + "";
|
|
|
}
|