Merge branch '20210406-maqv2' into 20210412-youhua

linzhijie

2021-04-12 3a8e1524dcf0eeb610d38123d5f0a3ef838379cd

 src/main/java/com/ots/project/exam/service/IEntDemographyInfoService.java

@@ -16,4 +16,11 @@
    int deleteEntDemographyInfoByIds(String ids);
    
    int deleteEntDemographyInfoById(Long infoId);

    /***
     * 获取填写语言
     * @param memberId
     * @return
     */
    String getlangType(Long memberId);
}