marge: 合并代码

restagent/config/config.go

@@ -123,6 +123,8 @@ type YamlConfig struct {
 		LicenseDir     string `yaml:"licensedir"`
 		EtcListIMS     string `yaml:"etcListIMS"`
 		EtcListDefault string `yaml:"etcListDefault"`
+		DpkgOverwrite  bool   `yaml:"dpkgOverwrite"`
+		DpkgTimeout    int    `yaml:"dpkgTimeout"`
 	} `yaml:"ne"`
 
 	Auth struct {