Merge branch 'dev' into pre-production

blade-service/logpm-factory-data/logpm-factory-data-linsy/src/main/java/com/logpm/factorydata/linsy/service/impl/DeliveryNoteServiceImpl.java

@@ -244,6 +244,8 @@ public class DeliveryNoteServiceImpl extends BaseServiceImpl<DeliveryNoteMapper,
 		advance.set("senderName", vo.getSenderName());
 		advance.set("senderMobile", vo.getSenderTelephone());
 		advance.set("senderAddress", vo.getSenderDetailAddress());
+		advance.set("create_time", DateUtil.now());
+		advance.set("update_time", DateUtil.now());
 
 		JSONArray packageList = new JSONArray();
 		for (PackageInfoVO orderPackageDTO : packages) {
@@ -294,6 +296,8 @@ public class DeliveryNoteServiceImpl extends BaseServiceImpl<DeliveryNoteMapper,
 			advanceDetailEntity.set("is_opai", 0);
 			advanceDetailEntity.set("administrators_id", 1126);
 			advanceDetailEntity.set("date100", new Date());
+			advanceDetailEntity.set("create_time", DateUtil.now());
+			advanceDetailEntity.set("update_time", DateUtil.now());
 			JSONObject entries = JSONUtil.parseObj(advanceDetailEntity);
 			packageList.add(entries);
 		}