Merge branch 'clh' into liuyang

mrDarker

6 天以前 829fe6c6bc33d53fda9c31fd45a37e1df87befff

 SourceCode/Bond/Servo/CEqCurrentRecipeChangeStep.cpp

@@ -24,12 +24,13 @@
   {
      CReadStep::getAttributeVector(attrubutes);

      unsigned int weight = 31;
      attrubutes.addAttribute(new CAttribute("UnitNo",
         std::to_string(m_nUnitNo).c_str(), ""));
         std::to_string(m_nUnitNo).c_str(), "", weight++));
      attrubutes.addAttribute(new CAttribute("CurrentMasterRecipeId",
         std::to_string(m_nCurrentMasterRecipeId).c_str(), ""));
         std::to_string(m_nCurrentMasterRecipeId).c_str(), "", weight++));
      attrubutes.addAttribute(new CAttribute("LocalRecipeId",
         std::to_string(m_nLocalRecipeId).c_str(), ""));
         std::to_string(m_nLocalRecipeId).c_str(), "", weight++));
   }

   int CEqCurrentRecipeChangeStep::onReadData()