mt-ck-00a/mt-ck-wms-ui
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fzq #64

Merged
zwq merged 5 commits from fzq into develop 2022-03-16 09:55:56 +08:00
Conversation 0 Commits 5 Files Changed 3 -5
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4a834c3dc1 - Show all commits

5
src/lang/i18n/en/module/basicData.js
View File

@ -1,13 +1,8 @@
/* /*
* @Author: gtz * @Author: gtz
* @Date: 2021-03-04 16:13:51 * @Date: 2021-03-04 16:13:51
<<<<<<< HEAD
* @LastEditors: fzq * @LastEditors: fzq
* @LastEditTime: 2022-03-15 18:33:48 * @LastEditTime: 2022-03-15 18:33:48
=======
* @LastEditors: zwq
* @LastEditTime: 2022-03-15 10:17:01
>>>>>>> develop
* @Description: file content * @Description: file content
*/ */
export default { export default {