Merge branch 'master' into yonge

mec-web/src/main/java/com/ym/mec/web/controller/ExportController.java

@@ -245,6 +245,10 @@ public class ExportController extends BaseController {
                         row.setSporadicType("声部更改");
                     } else if (row.getChargeType().equals(4)) {
                         row.setSporadicType("乐器更换");
+                    }else if (row.getChargeType().equals(5)) {
+                        row.setSporadicType("维修费");
+                    }else if (row.getChargeType().equals(6)) {
+                        row.setSporadicType("福袋活动");
                     }
                 }
             }