Merge remote-tracking branch 'origin/lzl-情侣专区' into lzl-情侣专区

# Conflicts:
#	src/main/java/com/sqx/modules/lovers/controller/LoversSetRuleController.java
#	src/main/java/com/sqx/modules/lovers/entity/LoversSet.java
#	src/main/java/com/sqx/modules/lovers/entity/LoversSetContent.java
#	src/main/java/com/sqx/modules/lovers/entity/LoversSetContentDetail.java
#	src/main/java/com/sqx/modules/lovers/entity/LoversSetMenstrualPeriodSetting.java
#	src/main/java/com/sqx/modules/lovers/entity/LoversSetOrderInfo.java
#	src/main/java/com/sqx/modules/lovers/entity/LoversSetRule.java
#	src/main/java/com/sqx/modules/lovers/service/LoversSetRuleService.java
#	src/main/java/com/sqx/modules/lovers/service/impl/LoversSetRuleServiceImpl.java

src/main/java/com/sqx/modules/lovers/controller/LoversSetController.java

@@ -0,0 +1,27 @@
+package com.sqx.modules.lovers.controller;
+
+import com.sqx.common.utils.Result;
+import com.sqx.modules.lovers.entity.LoversSet;
+import com.sqx.modules.lovers.service.LoversSetService;
+import io.swagger.annotations.Api;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+@Slf4j
+@Api(tags = {"管理端-情侣套餐"})
+@RestController
+@RequestMapping("/admin/loverSet")
+public class LoversSetController {
+
+    @Autowired
+    LoversSetService loversSetService;
+
+    @PostMapping("/save")
+    public Result saveLoverSet(@RequestBody LoversSet loversSet){
+        return loversSetService.saveLoverSet(loversSet);
+    }
+
+
+
+}

src/main/java/com/sqx/modules/lovers/entity/LoversSet.java

@@ -1,6 +1,8 @@
 package com.sqx.modules.lovers.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import io.swagger.annotations.ApiModel;
@@ -21,6 +23,7 @@ public class LoversSet implements Serializable {
 
     @ApiModelProperty("删除标识;0未删除、1已删除")
     @TableLogic(value = "0", delval = "1")
+    @TableField(fill = FieldFill.INSERT)
     private String delFlag;
 
     @ApiModelProperty("套餐名称")

src/main/java/com/sqx/modules/lovers/entity/LoversSetContent.java

@@ -1,6 +1,8 @@
 package com.sqx.modules.lovers.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import io.swagger.annotations.ApiModel;
@@ -19,6 +21,7 @@ public class LoversSetContent implements Serializable {
     private Long id;
 
     @ApiModelProperty("删除标识;0未删除、1已删除")
+    @TableField(fill = FieldFill.INSERT)
     @TableLogic(value = "0", delval = "1")
     private String delFlag;
 

src/main/java/com/sqx/modules/lovers/entity/LoversSetContentDetail.java

@@ -1,6 +1,8 @@
 package com.sqx.modules.lovers.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import io.swagger.annotations.ApiModel;
@@ -21,6 +23,7 @@ public class LoversSetContentDetail implements Serializable {
 
     @ApiModelProperty("删除标识;0未删除、1已删除")
     @TableLogic(value = "0", delval = "1")
+    @TableField(fill = FieldFill.INSERT)
     private String delFlag;
 
     @ApiModelProperty("情侣套餐内容id")

src/main/java/com/sqx/modules/lovers/entity/LoversSetMenstrualPeriodSetting.java

@@ -1,6 +1,8 @@
 package com.sqx.modules.lovers.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import io.swagger.annotations.ApiModel;
@@ -20,6 +22,7 @@ public class LoversSetMenstrualPeriodSetting implements Serializable {
 
     @ApiModelProperty("删除标识;0未删除、1已删除")
     @TableLogic(value = "0", delval = "1")
+    @TableField(fill = FieldFill.INSERT)
     private String delFlag;
 
     @ApiModelProperty("用户id")

src/main/java/com/sqx/modules/lovers/entity/LoversSetOrderInfo.java

@@ -1,6 +1,8 @@
 package com.sqx.modules.lovers.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import io.swagger.annotations.ApiModel;
@@ -21,6 +23,7 @@ public class LoversSetOrderInfo implements Serializable {
 
     @ApiModelProperty("删除标识;0未删除、1已删除")
     @TableLogic(value = "0", delval = "1")
+    @TableField(fill = FieldFill.INSERT)
     private String delFlag;
 
     @ApiModelProperty("订单编号")

src/main/java/com/sqx/modules/lovers/entity/LoversSetRule.java

@@ -1,6 +1,8 @@
 package com.sqx.modules.lovers.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import io.swagger.annotations.ApiModel;
@@ -8,6 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.time.LocalDateTime;
 
 @Data
 @ApiModel("lovers_set_rule")
@@ -20,6 +23,7 @@ public class LoversSetRule implements Serializable {
 
     @ApiModelProperty("删除标识;0未删除、1已删除")
     @TableLogic(value = "0", delval = "1")
+    @TableField(fill = FieldFill.INSERT)
     private String delFlag;
 
     @ApiModelProperty("规则名称")
@@ -30,4 +34,7 @@ public class LoversSetRule implements Serializable {
 
     @ApiModelProperty("规则内容")
     private String content;
+
+    @ApiModelProperty("创建时间")
+    private LocalDateTime createTime;
 }

src/main/java/com/sqx/modules/lovers/service/LoversSetService.java

@@ -1,7 +1,9 @@
 package com.sqx.modules.lovers.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.sqx.common.utils.Result;
 import com.sqx.modules.lovers.entity.LoversSet;
 
 public interface LoversSetService extends IService<LoversSet> {
+    Result saveLoverSet(LoversSet loversSet);
 }

src/main/java/com/sqx/modules/lovers/service/impl/LoversSetServiceImpl.java

@@ -1,11 +1,21 @@
 package com.sqx.modules.lovers.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.sqx.common.utils.Result;
 import com.sqx.modules.lovers.dao.LoversSetDao;
 import com.sqx.modules.lovers.entity.LoversSet;
 import com.sqx.modules.lovers.service.LoversSetService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 @Service
 public class LoversSetServiceImpl extends ServiceImpl<LoversSetDao, LoversSet> implements LoversSetService {
+    @Autowired
+    LoversSetDao loversSetDao;
+
+    @Override
+    public Result saveLoverSet(LoversSet loversSet) {
+
+        return null;
+    }
 }