Merge remote-tracking branch 'origin/master' into dev

xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalServiceImpl.java

@@ -262,14 +262,14 @@ public class TerminalServiceImpl implements TerminalService {
     public ServiceBody<TerminalUpdateModel> updateTerminalId(TerminalIdUpdateVo vo) {
         TerminalUpdateModel model = new TerminalUpdateModel();
         String cmd = Constants.CMD + "termid --flag=1 --cmdid=" + vo.getCmdId() + " --newcmdid=" + vo.getNewCmdId();
-        Integer retCode = ProcessExecUtils.exec(cmd);
+        ProcessExecUtils.exec(cmd);
         model.setTermId(vo.getTermId());
-        if (retCode == 0) {
+
         int result = terminalsDao.updateCmd(vo);
         if (result > 0) {
             return Asserts.success(model);
         }
-        }
+
         return Asserts.error("装置ID修改失败");
 
     }