Merge remote-tracking branch 'origin/develop' into develop

project-order/src/main/java/com/alibaba/cloud/integration/order/dto/DispatchEngineerOrderListResp.java

@@ -15,7 +15,7 @@ public class DispatchEngineerOrderListResp {
 		private String engineerName;
 		private String capacity;
 		private String capacityStatus;
-		private String certificate;
+		private String grade;
 		private List<OrderInfo> orders;
 	}
 	@Data

project-order/src/main/java/com/alibaba/cloud/integration/order/entity/CapacityEngineerStat.java

@@ -7,7 +7,7 @@ import java.sql.Timestamp;
 @Data
 public class CapacityEngineerStat {
 	private long id;
-	private String workDay;
+	private String workday;
 	private String engineerCode;
 	private Integer capTotal;
 	private Integer capUsed;

project-order/src/main/java/com/alibaba/cloud/integration/order/service/impl/DispatchServiceImpl.java

@@ -178,7 +178,7 @@ public class DispatchServiceImpl implements DispatchService {
 			eg.setOrders(items);
 			eg.setEngineerCode(e.getEngineerCode());
 			eg.setEngineerName(e.getName());
-			eg.setCertificate(e.getCredentials());
+			eg.setGrade(e.getGrade());
 			eg.setCapacity(String.format("%d/%d", capUsed, capTotal));
 			eg.setCapacityStatus(capacityStatus);
 
@@ -266,7 +266,7 @@ public class DispatchServiceImpl implements DispatchService {
 
 	private HashMap<String, CapacityEngineerStat> queryCapacityEngineerStat(List<String> engineerCodes, String date) {
 		LambdaQueryWrapper<CapacityEngineerStat> lqw = new LambdaQueryWrapper<>();
-		lqw.eq(CapacityEngineerStat::getWorkDay, date);
+		lqw.eq(CapacityEngineerStat::getWorkday, date);
 		lqw.in(CapacityEngineerStat::getEngineerCode, engineerCodes);
 		List<CapacityEngineerStat> records = capacityEngineerStatMPDao.selectList(lqw);