Merge remote-tracking branch 'origin/developerA' into developerA

src/main/resources/mappings/modules/super/CmSvipHistoryMapper.xml

@@ -105,13 +105,13 @@
             and packageId = #{packageId}
         </if>
         <if test='status == "1"'>
-            and endTime > NOW()
+            and NOW() between cs.beginTime and cs.endTime
         </if>
         <if test='status == "2"'>
-            and NOW() > endTime
+            and NOW() > cs.endTime
         </if>
         <if test='status == "3"'>
-            and beginTime > NOW()
+            and cs.beginTime > NOW()
         </if>
         order by cs.payTime desc
     </select>

src/main/webapp/WEB-INF/views/modules/svip/cmSvipHistoryForm.jsp

@@ -63,6 +63,7 @@
             <form:option value="" label="全部"/>
             <form:option value="1" label="已生效"/>
             <form:option value="2" label="已过期"/>
+            <form:option value="3" label="暂未生效"/>
         </form:select>
         &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
         <label>购买时间：</label>