Merge remote-tracking branch 'origin/master'

fengxiang

2018-03-13 7f905053f3f879092e18558401185dd6595dbe10

 src/main/webapp/js/moralmap.js

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