Merge remote-tracking branch 'origin/main'

# Conflicts: # DigitalHumanWeb/src/app/[variants]/(main)/applicationset/applicationset.tsx
2 months ago · c0fb4bf9f3
parent dc31663d1b 8e9fd5a9b9
commit c0fb4bf9f3
1 changed files with 1 additions and 1 deletions
--- a/DigitalHumanWeb/src/app/[variants]/(main)/applicationset/applicationset.tsx
+++ b/DigitalHumanWeb/src/app/[variants]/(main)/applicationset/applicationset.tsx
@ -825,7 +825,7 @@ const ApplicationSet = memo(() => {
            style={{ background: "#fff", width: '200px' }}
          />

-          <div id="fileRight" style={{height: "calc(100vh - 130px)", overflowY: 'scroll', width: "calc(100vw - 300px)"}}>
+          <div id="fileRight" style={{height: "100vh", overflowY: 'scroll', width: "calc(100vw - 300px)"}}>
            <div id="rmtj">
              <div className={cx(styles.leftTitle)}>热门推荐</div>
              <div>