Merge branch 'test'

family-doctor-server/src/main/resources/mapper/MobileBenefitPackageMapper.xml

@@ -89,7 +89,7 @@
     </select>
 
     <select id="queryMaxOneList" resultType="com.ebaiyihui.family.doctor.server.entity.MobileBenefitPackageEntity">
-        SELECT t.x_id,t.productId,t.phone,t.userId,t.orderId,t.timeLimit,t.used, t.benefitOrderId, t.benefitsStartTime, t.benefitsEndTime, t.isRenew
+        SELECT t.x_id,t.productId,t.phone,t.userId,t.orderId,t.timeLimit,t.used, t.activateOrderId, t.benefitsStartTime, t.benefitsEndTime, t.isRenew
         FROM mobile_benefit_package t
         LEFT JOIN mobile_benefit_package t2
             ON t.phone = t2.phone AND t.x_create_time &lt; t2.x_create_time