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

src/utils/LodopFuncs.js

@@ -112,6 +112,9 @@ export function getLodop(oOBJECT,oEMBED){
       };
       return LODOP;
     };
+    LODOP.SET_LICENSES("","4AE3961B0A17F2B39DCDA3787D40445D677","","");
+    alert("SET_LICENSES执行了");
+
 
     // LODOP.SET_LICENSES("","加密的秘钥","","");     // 加密密钥 防止不兼容 （删除水印）、
     // LODOP.SET_LICENSES("","13528A153BAEE3A0254B9507DCDE2839","EDE92F75B6A3D917F65910","D60BC84D7CF2DE18156A6F88987304CB6D8");