Merge branch 'iteration_0307' into jenkins

src/school/approval-manage/subsidy/details.tsx

@@ -64,9 +64,9 @@ export default defineComponent({
     })
     return () => (
       <div>
-        <OSticky>
+        {/* <OSticky>
           <OHeader />
-        </OSticky>
+        </OSticky> */}
         {!!state.record && (
           <div class={styles.wrap}>
             <div class={[styles.item, styles.listItem]}>

src/school/approval-manage/subsidy/exercise-detail.tsx

@@ -53,13 +53,13 @@ export default defineComponent({
     })
     return () => (
       <div>
-        <OSticky
+        {/* <OSticky
           onGetHeight={(height: number) => {
             document.documentElement.style.setProperty('--header-height', height + 'px')
           }}
         >
           <OHeader></OHeader>
-        </OSticky>
+        </OSticky> */}
         <OFullRefresh
           v-model:modelValue={refreshing.value}
           onRefresh={getData}
@@ -161,7 +161,7 @@ export default defineComponent({
                         <span class={[styles.topNum, styles.small]}>
                           {moneyFormat(item.actualSalary || 0)}
                         </span>
-                        课元
+                        元
                       </div>
                       <div>实际补助</div>
                     </div>