Browse code Merge branch 'dev' of http://192.168.0.203:8080/gitbucket/git/root/IRIS_FORNT_TEMPERATURE into dev # Conflicts: # src/views/memberManage/listStaff.vue dev master
commit 20ac4cdeacf0f9592013fed4f9ee95e5194446dd 2 parents 0e73305 + 56a0a33 zhangyingjie authored on 5 Jun 2020

Showing 16 changed files

• config/dev.env.js
• src/App.vue
• src/api/attendance.js
• src/api/person.js
• src/router/modules/attendance.js
• src/views/attendance/atdRules.vue
• src/views/attendance/editRemarks.vue
• src/views/attendance/editSpecialDay.vue
• src/views/attendance/listReport.vue
• src/views/attendance/makeReport.vue
• src/views/attendance/regular.vue
• src/views/attendance/specialDay.vue
• src/views/attendance/syncAndGenerate.vue
• src/views/memberManage/addPerson.vue
• src/views/memberManage/addPersonIris.vue
• src/views/memberManage/listStaff.vue

Ignore Space Show notes View config/dev.env.js

Ignore Space Show notes View src/App.vue

Ignore Space Show notes View src/api/attendance.js

Ignore Space Show notes View src/api/person.js

Ignore Space Show notes View src/router/modules/attendance.js

Ignore Space Show notes View src/views/attendance/atdRules.vue 0 → 100644

Ignore Space Show notes View src/views/attendance/editRemarks.vue

Ignore Space Show notes View src/views/attendance/editSpecialDay.vue

Ignore Space Show notes View src/views/attendance/listReport.vue

Ignore Space Show notes View src/views/attendance/makeReport.vue

Show notes View src/views/attendance/regular.vue 100644 → 0

Ignore Space Show notes View src/views/attendance/specialDay.vue

Ignore Space Show notes View src/views/attendance/syncAndGenerate.vue 0 → 100644

Ignore Space Show notes View src/views/memberManage/addPerson.vue

Ignore Space Show notes View src/views/memberManage/addPersonIris.vue

Ignore Space Show notes View src/views/memberManage/listStaff.vue

Show line notes below