Merge remote-tracking branch 'origin/dev' into dev

jiaosong

2023-10-17 7ec37d4b36111c0192f2c7674b07f8dd1daf1d53

 server/.gitignore

@@ -1,7 +1,7 @@
coderd.json
target/
*.iml
log/
service/log/
#idea
.idea
*.iws
@@ -15,7 +15,7 @@

# Log file
*.log
log/
service/log/
logs
.DS_Store
tmp