Merge branch 'refs/heads/dev' into test

share-admin/src/main/java/share/web/controller/system/SharingActivitiesController.java

@@ -85,6 +85,7 @@ public class SharingActivitiesController extends BaseController {
     @Log(title = "分享活动绑定关系", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody SharingActivities sharingActivities) {
+
         return toAjax(sharingActivitiesService.updateSharingActivities(sharingActivities));
     }
 

share-system/src/main/java/share/system/domain/SharingActivities.java

 package share.system.domain;
 
+import com.baomidou.mybatisplus.annotation.*;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import share.common.annotation.Excel;
 import share.common.core.domain.BaseEntity;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableLogic;
 import lombok.Data;
 /**
  * 分享活动绑定关系对象 s_sharing_activities
@@ -14,11 +13,13 @@ import lombok.Data;
  * @date 2024-09-14
  */
 @Data
+@TableName("s_sharing_activities")
 public class SharingActivities extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
     /** 主键 */
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     /** 活动类型(0-新用户注册，1-权益金会员分享) */