Merge branch 'feature/xinglee' into 'release'

fix: chage age to ageStr

See merge request com.pica.cloud.education.frontend/pica.cloud.web-education-admin!508

src/views/patients/mypatients-manage/patient-detail.vue

@@ -24,7 +24,7 @@
                 <div><p class="title">身份证：</p><p class="info">{{patientInfo.idNo | emptyFilter}}</p></div>
               </div>
               <div class="item">
-                <div><p class="title">出生日期：</p><p class="info">{{birthTimeDisplay | emptyFilter}}{{(patientInfo.age || patientInfo.age == 0) ? `、${patientInfo.age}岁` : ''}}</p></div>
+                <div><p class="title">出生日期：</p><p class="info">{{birthTimeDisplay | emptyFilter}}{{(patientInfo.ageStr || patientInfo.ageStr == 0) ? `、${patientInfo.ageStr}` : ''}}</p></div>
                 <div><p class="title">性别：</p><p class="info">{{patientInfo.sex | sexFileter}}</p></div>
               </div>
               <div class="item">

src/views/patients/mypatients-manage/patients-list.vue

@@ -105,12 +105,12 @@
           </template>
         </el-table-column>
         <el-table-column
-          prop="age"
+          prop="ageStr"
           label="年龄"
           width="80"
           align="center">
           <template slot-scope="scope">
-            <span v-if="scope.row.age || (scope.row.age==0)">{{scope.row.age}}</span>
+            <span v-if="scope.row.ageStr || (scope.row.ageStr==0)">{{scope.row.ageStr}}</span>
             <span v-else>-</span>
           </template>
         </el-table-column>