Merge branch 'master' of http://62.234.61.92:3000/wjm/mec-cloud_IntelligentManufacturing_CLIENT

zkqy-business/src/main/java/com/zkqy/business/controller/CommonBtnController.java

@@ -133,6 +133,7 @@ public class CommonBtnController extends BaseController {
                     //irunImplementationClass.RunScriptImplementationClassLogicCode(iScriptEntity,commonEntity.toString());
                 }
             }
+            commonEntity.getCommMap().putAll(commonEntity.getBtnParametersMap());
             return toAjax(commonService.edit(commonEntity));
         } else if (commonEntity.getBasicMap().get("visible").toString().equals("false")) {
             Map<String, Object> map = new HashMap<>();