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

peng

5 天以前 134f5b1aedeb90b9f7a71dc41e8f08e96bcb3f85

 framework/src/main/java/cn/lili/modules/store/serviceimpl/FreightTemplateServiceImpl.java

@@ -145,6 +145,7 @@
        List<FreightTemplateChild> list = new ArrayList<>();
        for (FreightTemplateChild freightTemplateChild : freightTemplateVO.getFreightTemplateChildList()) {
            freightTemplateChild.setFreightTemplateId(freightTemplate.getId());
            freightTemplateChild.setId(null);
            list.add(freightTemplateChild);
        }
        //添加模板子内容