Merge remote-tracking branch 'origin/master'

boman-web-core/src/main/resources/mapper/VaccineInfoMapper.xml

@@ -41,6 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="nowIn"    column="now_in"    />
         <result property="url"    column="url"    />
         <result property="shouldSlow"    column="should_slow"    />
+        <result property="progress"    column="progress"    />
         <collection  property="vaccineInfoUserList"   javaType="java.util.List"        resultMap="VaccineInfoUser" />
     </resultMap>