Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

# Conflicts:
#	common/common-entity/src/main/java/com/yihu/jw/entity/IntegerIdentityEntity.java

business/base-service/src/main/java/com/yihu/jw/hospital/doctor/dao/service/BaseDoctorBGService.java

@@ -93,7 +93,7 @@ public class BaseDoctorBGService extends BaseJpaService<BaseDoctorBackgroundDO,
        }
        if (StringUtils.isNotBlank(content)){
            sql +=" and content_type like '%"+contentType+"%'v";
            sql +=" and content like '%"+content+"%'v";
        }
        sql +=" order by is_sort desc ";