Merge branch 'dev' into 'main'

Dev

See merge request !8
2 jobs for main in 45 seconds (queued for 1 second)
Status Job ID Name Coverage
  Deploy
failed #336459
deploy

00:00:45

 
  Publish
skipped #336460
publish
 
Name Stage Failure
failed
deploy Deploy
Step 3/12 : ENV JAR "ruoyi-admin.jar"
---> Using cache
---> ec4fa3a160bb
Step 4/12 : ENV TZ "Asia/Shanghai"
---> Using cache
---> 06ffc9ce14a8
Step 5/12 : ADD ./ruoyi-admin/target/${JAR} .
lstat ruoyi-admin/target/ruoyi-admin.jar: no such file or directory
ERROR: Job failed: exit code 1