Merge remote-tracking branch 'origin/dev_business' into dev_business

liyong

4 天以前 f90d9f53beb844265c4153159aadb0baf81bafdb

 yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/tender/SrmTenderBidController.java

@@ -111,6 +111,7 @@
            if (material != null) {
                vo.setTenderMaterialCode(material.getProductCode());
                vo.setTenderMaterialName(material.getProductName());
                vo.setMaterialName(material.getProductName());
                vo.setTenderMaterialSpec(material.getProductSpec());
                vo.setTenderMaterialUnit(material.getUnit());
            }