diff --git a/ruoyi-cms/src/main/java/com/ruoyi/cms/controller/ApiWxPayController.java b/ruoyi-cms/src/main/java/com/ruoyi/cms/controller/ApiWxPayController.java
index e9c3dba04..bcf6a0041 100644
--- a/ruoyi-cms/src/main/java/com/ruoyi/cms/controller/ApiWxPayController.java
+++ b/ruoyi-cms/src/main/java/com/ruoyi/cms/controller/ApiWxPayController.java
@@ -70,7 +70,7 @@ public class ApiWxPayController extends BaseController {
 			courseUser.setCreateDate(new Date());
 			courseUser.setUpdateDate(new Date());
 			courseUser.setRemarks("微信支付成功回调，订单ID:"+vipUserOrders.getId());
-			trainCourseUserService.insertSelectiveNormal(courseUser);
+			trainCourseUserService.insertSelective(courseUser);
 		}
 		return WxPayNotifyResponse.success("成功");
 	}
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/base/AbstractBaseService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/base/AbstractBaseService.java
index 82e0ce54b..96fcb511c 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/base/AbstractBaseService.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/base/AbstractBaseService.java
@@ -64,19 +64,6 @@ public abstract interface AbstractBaseService<T> {
      * @return
      */
     public int insertSelective(T entity);
-    /**
-     * 保存
-     * @param entity
-     * @return
-     */
-    public int insertNormal(T entity);
-
-    /**
-     * 保存不为null的数据
-     * @param entity
-     * @return
-     */
-    public int insertSelectiveNormal(T entity);
 
     /**
      * 删除符合条件的数据
@@ -101,7 +88,7 @@ public abstract interface AbstractBaseService<T> {
     public int deleteByIds(String ids);
 
     /**
-     * 根据编码ID全部字段更新
+     * 根据编码ID全部字段更新（自动填充用户信息）
      * 包含（NULL）
      * @param entity
      * @return
@@ -109,7 +96,7 @@ public abstract interface AbstractBaseService<T> {
     public int updateById(T entity) ;
 
     /**
-     * 根据编码ID更新
+     * 根据编码ID更新（自动填充用户信息）
      * 不包含（NULL）
      * @param entity
      * @return
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/base/AbstractBaseServiceImpl.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/base/AbstractBaseServiceImpl.java
index d65ad9b3c..93a5b6c04 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/base/AbstractBaseServiceImpl.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/base/AbstractBaseServiceImpl.java
@@ -68,14 +68,7 @@ public abstract class AbstractBaseServiceImpl<M extends MyMapper<T>, T> implemen
         EntityUtils.setCreateAndUpdateInfo(entity);
         return  mapper.insertSelective(entity);
     }
-    @Override
-    public int insertNormal(T entity) {
-        return mapper.insert(entity);
-    }
-    @Override
-    public int insertSelectiveNormal(T entity) {
-        return  mapper.insertSelective(entity);
-    }
+
 
     @Override
     public int delete(T entity) {
@@ -104,7 +97,6 @@ public abstract class AbstractBaseServiceImpl<M extends MyMapper<T>, T> implemen
         EntityUtils.setUpdatedInfo(entity);
         return mapper.updateByPrimaryKeySelective(entity);
     }
-
     @Override
     public List<T> selectByExample(Object example) {
         return mapper.selectByExample(example);
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/util/EntityUtils.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/util/EntityUtils.java
index ae0aad247..6bb7eb1bf 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/util/EntityUtils.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/util/EntityUtils.java
@@ -21,8 +21,8 @@ public class EntityUtils {
      * @author 王浩彬
      */
     public static <T> void setCreateAndUpdateInfo(T entity) {
-        setCreateInfo( entity );
-        setUpdatedInfo( entity );
+        setCreateInfo(entity);
+        setUpdatedInfo(entity);
     }
 
     /**
@@ -35,12 +35,14 @@ public class EntityUtils {
         try {
             Method[] methods = entity.getClass().getMethods();
             for (Method m : methods) {
-                if (m.getName().equals( "setCreateBy" )) {
-                    m.invoke( entity,com.ruoyi.framework.web.util.ShiroUtils.getLoginName() );
-                } else if (m.getName().equals( "setCreateDate" )) {
-                    m.invoke( entity, new Date() );
-                } else if (m.getName().equals( "setCreateTime" )) {
-                    m.invoke( entity, new Date() );
+                if (m.getName().equals("setCreateBy")) {
+                    if (null != com.ruoyi.framework.web.util.ShiroUtils.getSysUser()) {
+                        m.invoke(entity, com.ruoyi.framework.web.util.ShiroUtils.getLoginName());
+                    }
+                } else if (m.getName().equals("setCreateDate")) {
+                    m.invoke(entity, new Date());
+                } else if (m.getName().equals("setCreateTime")) {
+                    m.invoke(entity, new Date());
                 }
 
 
@@ -60,12 +62,14 @@ public class EntityUtils {
         try {
             Method[] methods = entity.getClass().getMethods();
             for (Method m : methods) {
-                if (m.getName().equals( "setUpdateBy" )) {
-                    m.invoke( entity,com.ruoyi.framework.web.util.ShiroUtils.getLoginName());
-                } else if (m.getName().equals( "setUpdateDate" )) {
-                    m.invoke( entity, new Date() );
-                } else if (m.getName().equals( "setUpdateTime" )) {
-                    m.invoke( entity, new Date() );
+                if (m.getName().equals("setUpdateBy")) {
+                    if (null != com.ruoyi.framework.web.util.ShiroUtils.getSysUser()) {
+                        m.invoke(entity, com.ruoyi.framework.web.util.ShiroUtils.getLoginName());
+                    }
+                } else if (m.getName().equals("setUpdateDate")) {
+                    m.invoke(entity, new Date());
+                } else if (m.getName().equals("setUpdateTime")) {
+                    m.invoke(entity, new Date());
                 }
             }
         } catch (Exception e) {