Merge branch 'master' into wangfy-dev

wfy

2021-09-18 0417d31de9980cbc1735daffffb308d050ce35b4

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

old mode 100644
new mode 100755
@@ -130,5 +130,11 @@
        return Integer.parseInt(businessMachineAttrInfos.get(0).get("count").toString());
    }

    @Override
    public int saveMachineAttrs(Map info) {
        int saveFlag = sqlSessionTemplate.update("machineAttrServiceDaoImpl.saveMachineAttrs", info);
        return saveFlag;
    }


}