Commit History

Author SHA1 Message Date
  Roc 013fed127d Merge remote-tracking branch 'origin/ETA_2.4.0' into debug 4 months ago
  Roc de9bd5eec9 fix:合并ppt需要保留原来Ppt里面的表格样式 4 months ago
  Roc fc662ec4f5 fix;ppt转报告、英文ppt;以及英文ppt转英文报告,需要继承对应的表格样式 4 months ago
  Roc 53085d677e Merge remote-tracking branch 'origin/ETA_2.4.0' into debug 4 months ago
  Roc 9490d07453 fix 4 months ago
  xiziwen b2fd4af54a Merge branch 'ETA_2.4.0' into debug 4 months ago
  xiziwen cf4b813c1a fix 4 months ago
  xiziwen 9b3664a7af Merge branch 'ETA_2.4.0' into debug 4 months ago
  xiziwen bf1fd39f79 fix 4 months ago
  xiziwen e2b85045c7 Merge branch 'ETA_2.4.0' into debug 4 months ago
  xiziwen ea1c7ab32f first 4 months ago
  hsun a8d9f7d48b Merge branch 'hotfix/ppt_edit_0805' into debug 9 months ago
  hsun 01d4946808 fix 9 months ago
  hsun 7361291e9f Merge branch 'hotfix/ppt_edit_0805' into debug 9 months ago
  hsun 71cdefd848 fix 9 months ago
  hsun 1ee498ad85 Merge branch 'hotfix/ppt_edit_0805' into debug 9 months ago
  hsun 1a10178fd6 新增中英文PPT编辑校验接口 9 months ago
  Roc 01194fb80f Merge remote-tracking branch 'origin/master' into eta/1.8.3 10 months ago
  zqbao 62f7016d21 Merge branch 'debug' of http://8.136.199.33:3000/eta_server/eta_api into bzq1/execl-edit_conflict 10 months ago
  hongze ec3078ea34 Merge branch 'aj_ppt' into custom 10 months ago
  zqbao 51fa7ed1ea Merge branch 'master' of http://8.136.199.33:3000/eta_server/eta_api into custom 10 months ago
  hongze 25a42af78f Merge branch 'aj_ppt' into debug 11 months ago
  hongze 76d2c1960c 新增PPT复制 11 months ago
  hongze 6abd4f4926 新增PPT标题设置 11 months ago
  hongze 96e234c868 新增PPT标题设置 11 months ago
  鲍自强 1b7c7a7411 Merge branch 'bzq1/ppt' of eta_server/eta_api into debug 11 months ago
  zqbao 9498dd7e49 fix:修复ppt save接口 11 months ago
  zqbao 5ba3a144f4 Merge branch 'debug' of http://8.136.199.33:3000/eta_server/eta_api into bzq1/ppt_conflict 11 months ago
  zqbao bd08e210d9 fix:修复自动保存ppt的bug 11 months ago
  Roc c97f11adb1 fix:ppt转报告 11 months ago