Merge branch 'master' into master-任务组

陈昶聿

4 小时以前 6e3d0a2097a4d841e941a84ec54780a67eb60ba1

 smartor/src/main/java/com/smartor/service/impl/IvrLibaTargetServiceImpl.java

@@ -201,6 +201,8 @@
                    ivrLibaTargetoption.setDynamiccruxsJson(new Gson().toJson(ivrLibaTargetoption.getDynamiccruxs()));
                }

                //指标库排序
                ivrLibaTargetoption.setSortid(ivrLibaTargetoption.getGuid());
                ivrLibaTargetoption.setGuid(ivrLibaTargetVO.getGuid());
                ivrLibaTargetoption.setOrgid(ivrLibaTargetVO.getOrgid());
                if (ivrLibaTargetoption.getIsoperation() != null && ivrLibaTargetoption.getIsoperation() == 1) {