Merge branch 'master' into wangfy-dev

wfy

2021-09-18 0417d31de9980cbc1735daffffb308d050ce35b4

 service-common/src/main/java/com/java110/common/dao/impl/MachineRecordServiceDaoImpl.java

old mode 100644
new mode 100755
@@ -136,5 +136,16 @@
        return machineRecordInfos;
    }

    @Override
    public int saveMachineRecords(Map info) {
        int saveFlag = sqlSessionTemplate.update("machineRecordServiceDaoImpl.saveMachineRecords", info);

        if (saveFlag < 1) {
            throw new DAOException(ResponseConstant.RESULT_PARAM_ERROR, "添加数据失败：" + JSONObject.toJSONString(info));
        }

        return saveFlag;
    }


}