Merge remote-tracking branch 'origin/master'

lyh

2 天以前 58f63d0e061123b15f780d294272d8a461f183db

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusDeactivateServiceImpl.java

@@ -175,6 +175,7 @@
            detail.setCreateTime(null);
            detail.setUpdateBy(null);
            detail.setUpdateTime(null);
            detail.setApplicationId(order.getId());
        });
        deactivateDetailService.saveBatch(request.getTableDetailList());
        return true;
@@ -211,6 +212,7 @@
            detail.setCreateTime(null);
            detail.setUpdateBy(null);
            detail.setUpdateTime(null);
            detail.setApplicationId(entity.getId());
        });
        deactivateDetailService.saveBatch(request.getTableDetailList());
        return true;