858dc9f2fe627c5ca255bc50fea7016f29118f65
# Conflicts: # src/apps/AppMonitoringObject/Add.vue
Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_wxcp_app into dev
Description
No description provided