Merge branch 'dev' of http://221.226.25.34:3000/chenwei/weaver-hostar into dev-zm

 Conflicts:

	src/com/engine/kq/cmd/report/ExportDailyExcelCmd.java

src/com/engine/kq/cmd/report/ExportDailyExcelCmd.java

@@ -185,11 +185,11 @@ public class ExportDailyExcelCmd extends AbstractCommonCommand<Map<String, Objec
       }else {
         forgotBeginWorkCheck_field = " isnull(b.forgotBeginWorkCheck,0) ";
       }
-      String backFields = " zm.cccb as mealAllowance," +
+        String backFields = " zm.cccb as mealAllowance," +
-              " zm.zdcb as statAllowance," +
+                " zm.zdcb as statAllowance," +
-              " zm.jmybcb as nightAllowance," +
+                " zm.jmybcb as nightAllowance," +
-              " zm.hrzdcb as otherStatAllowance," +
+                " zm.hrzdcb as otherStatAllowance," +
-              " zm.ybbz as nightShiftSubsidy, "+
+                " zm.ybbz as nightShiftSubsidy, "+
               " a.id,a.lastname,a.subcompanyid1 as subcompanyid,a.departmentid, a.workcode,b.jobtitle,a.dsporder," +
               " b.kqdate, b.workdays,b.workMins,b.serialid, b.attendancedays,FLOOR( b.attendanceMins / 30 ) * 30 AS attendanceMins ,b.beLate," +
               " b.beLateMins,b.graveBeLate,b.graveBeLateMins,b.leaveEearly,b.leaveEarlyMins,b.graveLeaveEarly," +