解决冲突

2022-04-27 13:45:00 +08:00
parent f0afe10ec1
commit 5a429bafdf
11 changed files with 61 additions and 77 deletions
--- a/src/app/routes/sys-setting/components/basic-setting/basic-setting.component.html
+++ b/src/app/routes/sys-setting/components/basic-setting/basic-setting.component.html
@ -4,7 +4,7 @@
 * @Author       : Shiming
 * @Date         : 2022-04-21 13:49:22
 * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-27 10:56:40
+ * @LastEditTime : 2022-04-27 11:29:10
 * @FilePath     : \\tms-obc-web\\src\\app\\routes\\sys-setting\\components\\basic-setting\\basic-setting.component.html
 * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->