Merge branch 'zx_saas_goodsCopy' of http://git.dayaedu.com/yonge/mec into test

# Conflicts:
#	pom.xml

mec-biz/src/main/java/com/ym/mec/biz/service/impl/LessonCoursewareServiceImpl.java

@@ -207,11 +207,11 @@ public class LessonCoursewareServiceImpl extends ServiceImpl<LessonCoursewareMap
                                 List<CbsMaterialRefWrapper.AddMaterialRef> materialRefs = materialSmall.getMaterialRefs();
                                 if (CollectionUtils.isNotEmpty(materialRefs)){
                                     for (CbsMaterialRefWrapper.AddMaterialRef materialRef : materialRefs) {
-                                        materialRef.setResourceId(null);
+//                                        materialRef.setResourceId(null);
                                         CbsMaterialRefWrapper.RelateMaterialInfo relateMaterialInfo = materialRef.getRelateMaterialInfo();
                                         if(relateMaterialInfo != null && StringUtils.equals(relateMaterialInfo.getType(),"SONG")
                                                 && CollectionUtils.isNotEmpty(relateMaterialInfo.getApplicationIdList())){
-                                            materialRef.setResourceId(relateMaterialInfo.getId());
+                                            materialRef.setResourceIdStr(relateMaterialInfo.getId().toString());
                                         }
                                     }
                                 }

pom.xml

@@ -26,7 +26,7 @@
 		<docker.registry.repository>127.0.0.1:5000</docker.registry.repository>
 		<docker.maven.plugin.version>1.2.2</docker.maven.plugin.version>
 		<com.microsvc.toolkit.version>1.0.8</com.microsvc.toolkit.version>
-		<cbs.version>1.0.13</cbs.version>
+		<cbs.version>1.0.14</cbs.version>
 	</properties>
 
 	<dependencyManagement>