Merge remote-tracking branch 'origin/fix-bug-202303' into fix-bug-202303

2023-03-16 13:39:51 +08:00
parent 7f42839bab 580c720c05
commit f003e6cdf3
17 changed files with 387 additions and 213 deletions
@@ -614,6 +614,7 @@ public class oConvertUtils {
 		} catch (IllegalAccessException e) {
 			log.error("entityToModel : 安全权限异常", e);
 		}
+		assert model != null;
 		BeanUtils.copyProperties(entity, model);
 		return (T)model;
 	}