Merge branch 'test'

# Conflicts:
#	family-doctor-server/src/main/java/com/ebaiyihui/family/doctor/server/service/impl/PatientSignServiceImpl.java

family-doctor-server/src/main/java/com/ebaiyihui/family/doctor/server/service/impl/PatientSignServiceImpl.java

@@ -323,7 +323,7 @@ public class PatientSignServiceImpl implements PatientSignService {
         PatientSignEntity patientSign = new PatientSignEntity();
         patientSign.setPatientPhone(phone);
         psWrapper.setEntity(patientSign);
-        psWrapper.orderByDesc("createTime");
+//        psWrapper.orderByDesc("create_time");
 //        psWrapper.last("limit 1");
         List<PatientSignEntity> pse = patientSignMapper.selectList(psWrapper);
         return pse;

family-doctor-server/src/main/java/com/ebaiyihui/family/doctor/server/task/SignedTask.java

@@ -188,6 +188,7 @@ public class SignedTask {
     }
 
     @Scheduled(cron = "0 0 1 * * ?")
+//    @Scheduled(cron = "0 */2 * * * ?")
     public void orderInvalidation() {
         log.info("开始进行权益信息处理...");
         List<MobileBenefitPackageEntity> mobileBenefitPackageEntities = mobileBenefitPackageMapper.queryMaxOneList();