update

.gitattributes

-config/config.php merge=ours
-webmain/model/loginModel.php merge=ours
-webmain/webmainConfig.php merge=ours
-.idea/ merge=ours
-images/OA二维码.png merge=ours
+/config/config.php merge=ours
+/webmain/model/loginModel.php merge=ours
+/webmain/webmainConfig.php merge=ours
+/.idea/ merge=ours
+/images/OA二维码.png merge=ours