Merge branch 'ysx-自营商品读取标准品牌-20220328' into dev

.gitignore

-/go.sum
-/.idea/
-gowatch.yml
-*.exe
-*.exe~
-cmd.exe~
-/cmd/logs/
-/cmd/*.exe~
-/cmd/logs
-/bat/logs/
-/conf/prod/*.ini
-/go.mod
-/logs
-
-/mylogs
-/doc/test
-/vm.sh
-/cmd/http
-/doc/spuTest
-/doc/test3
-/.history
-
+/go.sum
+/.idea/
+gowatch.yml
+*.exe
+*.exe~
+cmd.exe~
+/cmd/logs/
+/cmd/*.exe~
+/cmd/logs
+/bat/logs/
+/conf/prod/*.ini
+/go.mod
+/logs
+
+/mylogs
+/doc/test
+/vm.sh
+/cmd/http
+/doc/spuTest
+/doc/test3
+/.history
+/.vscode
+