From 5f6614b4f448890f0b6e82376093ee2878f4464d Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 29 Jul 2022 15:21:45 +0800
Subject: [PATCH] 合并冲突
---
src/utils/defaultValue.js | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/utils/defaultValue.js b/src/utils/defaultValue.js
index 9a52e51..edddf68 100644
--- a/src/utils/defaultValue.js
+++ b/src/utils/defaultValue.js
@@ -11,11 +11,11 @@
* @example
* param = Cesium.defaultValue(param, 'default');
*/
-function defaultValue(a, b) {
+function defaultValue (a, b) {
if (a !== undefined && a !== null) {
- return a;
+ return a
}
- return b;
+ return b
}
/**
@@ -24,6 +24,6 @@
* @type {Object}
* @memberof defaultValue
*/
-defaultValue.EMPTY_OBJECT = Object.freeze({});
+defaultValue.EMPTY_OBJECT = Object.freeze({})
-export default defaultValue;
+export default defaultValue
--
Gitblit v1.9.3