Merge branch 'dev' of lyr/patient-co-management into dev

src/main/java/com/yihu/wlyy/service/app/sign/FamilyContractService.java

@@ -1301,7 +1301,7 @@ public class FamilyContractService extends BaseService {
            pagesize = 10;
        }
        // 排序
        Sort sort = new Sort(Direction.DESC, "status");
        Sort sort = new Sort(Direction.DESC, "over");
        sort.and(new Sort(Direction.DESC,"read"));
        // 分页信息
        PageRequest pageRequest = new PageRequest(0, pagesize, sort);

src/main/resources/system.properties

@@ -77,6 +77,8 @@ im_list_get=http://172.19.103.76:3000/
#wechat_token=27eb3bb24f149a7760cf1bb154b08040
##是否签约检查和签约数据上传
#sign_check_upload=http://172.19.103.85:8011
##im一对一列表获取
#im_list_get=http://172.13.103.88:3000/
im_group_server=http://120.41.252.108:3031/group/sendgroupmsg.im
msg_push_server=http://120.41.252.108:3031/push/sendmsg.im