--no commit message

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/content/ArticleLibraryController.java

@@ -70,9 +70,13 @@ public class ArticleLibraryController {
 	@PostMapping(value = ResourceRequestPath.SAVE)
 	public CallBack<Boolean> save(@RequestBody SaveUpdateArticleLibraryForm form)
 			throws IOException, ParseException {
+		SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 		ArticleLibrary entity = new ArticleLibrary();
 		BeanUtils.copyProperties(form, entity);
 		if(entity.getId() == null){
+			if(form.getTimingTime()!=null && form.getTimingTime()!=""){
+				entity.setTimingTime(df.parse(form.getTimingTime()));
+			}
 			entity.setResourceType(2);
 			entity.setIsDelete(0);
 			entity.setPublishStatus(form.getPublishStatus());
@@ -86,6 +90,9 @@ public class ArticleLibraryController {
 		}else{
 			entity = articleService.selectByPrimaryKey(entity.getId());
 			BeanUtils.copyProperties(form, entity);
+			if(form.getTimingTime()!=null && form.getTimingTime()!=""){
+				entity.setTimingTime(df.parse(form.getTimingTime()));
+			}
 			entity.setUpdateTime(new Date());
 			articleService.updateByPrimaryKey(entity );
 			ResourceRelation res =new ResourceRelation();