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

# Conflicts:
#	business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/entrance/XzzxEntranceService.java

svr/svr-wlyy-health-bank/src/main/java/com/yihu/jw/util/ISqlUtils.java

@@ -84,6 +84,7 @@ public class ISqlUtils {
        }else if (StringUtils.isNoneBlank(endTime)&&!StringUtils.isNoneBlank(startTime)){
            sb.append(" and end_time <= '"+endTime+"'");
        }
        sb.append(" and type<>'健康计划'");
        if(isFlag.equalsIgnoreCase("*")){
            sb.append(" ORDER BY create_time DESC ").append("LIMIT ").append((page-1)*size+",").append(size);
        }
@@ -98,7 +99,7 @@ public class ISqlUtils {
        Class c =object.getClass();
        Table table = (Table)c.getAnnotation(Table.class);
        String tableName = table.name();
        sb.append("select * from ").append(tableName).append(" where 1=1 ");
        sb.append("select * from ").append(tableName).append(" where 1=1 and type<>'健康计划' ");
        Field[] fArray= c.getDeclaredFields();
        for(Field f:fArray){
            //拿到字段后与实体类中的属性匹配，并得到其get方法，用来获取他的属性值