Merge dev commit '28668532ed2f97a3883be7e68bced252bd1f99bf' into addFeature

wu_xinjun

2022-03-23 563f7741ad28a6a578b56c98c27f92b3677958bd

 .gitignore

@@ -13,11 +13,16 @@

# data & image & microwave
Data
data
Images
Image*
image*
Images*
Microwaves
Manual_Microwave*

# log
**/log*/
*.log
*.ply