1. 代码合并冲突，重新提交

mrDarker

2025-09-08 4849a5172d454dd2f95a956f4662606f5f3a68ff

 SourceCode/Bond/Servo/CAttribute.h

@@ -7,7 +7,7 @@
   public:
      CAttribute();
      CAttribute(const char* pszName, const char* pszValue, const char* pszDescription, unsigned int weight);
      ~CAttribute();
      virtual ~CAttribute();

   public:
      std::string& getName();