Merge branch '03/03GRADE' into test

src/views/studentManager/studentList.vue

@@ -260,10 +260,10 @@
             label="会员截止日期"
           >
           <template slot-scope="scope">
-            <div v-if="scope.row.membershipEndTime && memberRankSettingId == 0" class="red">
+            <div v-if="scope.row.membershipEndTime && scope.row.memberRankSettingId == 0" class="red">
               会员未生效
             </div>
-            <div v-else-if="scope.row.membershipEndTime && memberRankSettingId != 0" :class="checkDate(scope.row.membershipEndTime)?'':'red'">
+            <div v-else-if="scope.row.membershipEndTime && scope.row.memberRankSettingId != 0" :class="checkDate(scope.row.membershipEndTime)?'':'red'">
               {{scope.row.membershipEndTime|dayjsFormat}}
             </div>
             <div v-else class="red">