Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2.git

xufenglei

2018-03-13 d4f150414533b95324b2a1c8a81c11d92efb71ec

 src/main/webapp/js/moralmap.js

@@ -350,7 +350,7 @@
               break;
            case 4:
               state = 'state04';
               stateName = '维护';
               stateName = '维保';
               break;
         }
         return {