Merge branch 'project-jmga-2.2.0-2.0.1' into project-jmga-dev

src/main/java/com/fdkankan/contro/service/impl/CommonServiceImpl.java

@@ -399,7 +399,7 @@ public class CommonServiceImpl implements ICommonService {
         if(sceneEditInfo == null){
             sceneEditInfo = new SceneEditInfo();
             sceneEditInfo.setScenePlusId(scenePlus.getId());
-            sceneEditInfo.setDescription(scenePlus.getDescription());
+//            sceneEditInfo.setDescription(scenePlus.getDescription());
             sceneEditInfo.setTitle(scenePlus.getTitle());
             sceneEditInfoService.save(sceneEditInfo);
         }else{

src/main/java/com/fdkankan/contro/service/impl/SceneFileBuildServiceImpl.java

@@ -1050,9 +1050,9 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
         if (sceneName != null) {
             scenePlus.setTitle(sceneName);
         }
-        if (sceneDec != null) {
-            scenePlus.setDescription("<p>" + new String(sceneDec.getBytes("UTF-8")) + "</p>");
-        }
+//        if (sceneDec != null) {
+//            scenePlus.setDescription("<p>" + new String(sceneDec.getBytes("UTF-8")) + "</p>");
+//        }
 
         if (sceneType != null) {
             scenePlus.setSceneType(sceneType);
@@ -1083,7 +1083,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
             scenePlusExt.setPlusId(scenePlus.getId());
             scenePlusExtService.save(scenePlusExt);
             sceneEditInfo.setTitle(scenePlus.getTitle());
-            sceneEditInfo.setDescription(scenePlus.getDescription());
+//            sceneEditInfo.setDescription(scenePlus.getDescription());
             sceneEditInfo.setScenePlusId(scenePlus.getId());
 
             if(StrUtil.isNotBlank(sceneKey)) {