Merge branch 'master' of http://git.zthymaoyi.com/zyw/tourism

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/tourism/ICommonUserInfoService.java

@@ -28,9 +28,9 @@ public interface ICommonUserInfoService{
 							@HttpParam(name = "password", type = HttpParamType.COMMON, description = "密码") String password,
 							@HttpParam(name = "phone", type = HttpParamType.COMMON, description = "手机号") String phone,
 							@HttpParam(name = "realname", type = HttpParamType.COMMON, description = "真实姓名") String realname,
-							@HttpParam(name = "shareCard", type = HttpParamType.COMMON, description = "允许他人分享名片(1允许)") Long shareCard,
-							@HttpParam(name = "lookPage", type = HttpParamType.COMMON, description = "允许圈子成员查看主页(1允许)") Long lookPage,
-							@HttpParam(name = "autoAccept", type = HttpParamType.COMMON, description = "自动接受邀请(1是)") Long autoAccept,
+							@HttpParam(name = "automaticSkip", type = HttpParamType.COMMON, description = "自动跳转(1开启)") Long automaticSkip,
+							@HttpParam(name = "myEntry", type = HttpParamType.COMMON, description = "我的入驻") String myEntry,
+							@HttpParam(name = "defaultEntry", type = HttpParamType.COMMON, description = "默认入驻") String defaultEntry,
 							@HttpParam(name = "status", type = HttpParamType.COMMON, description = "0.冻结 1.激活") Long status,
 							@HttpParam(name = "gmtCreate", type = HttpParamType.COMMON, description = "") Date gmtCreate,
 							@HttpParam(name = "gmtUpdate", type = HttpParamType.COMMON, description = "") Date gmtUpdate,
@@ -54,9 +54,9 @@ public interface ICommonUserInfoService{
 							@HttpParam(name = "password", type = HttpParamType.COMMON, description = "密码") String password,
 							@HttpParam(name = "phone", type = HttpParamType.COMMON, description = "手机号") String phone,
 							@HttpParam(name = "realname", type = HttpParamType.COMMON, description = "真实姓名") String realname,
-							@HttpParam(name = "shareCard", type = HttpParamType.COMMON, description = "允许他人分享名片(1允许)") Long shareCard,
-							@HttpParam(name = "lookPage", type = HttpParamType.COMMON, description = "允许圈子成员查看主页(1允许)") Long lookPage,
-							@HttpParam(name = "autoAccept", type = HttpParamType.COMMON, description = "自动接受邀请(1是)") Long autoAccept,
+							@HttpParam(name = "automaticSkip", type = HttpParamType.COMMON, description = "自动跳转(1开启)") Long automaticSkip,
+							@HttpParam(name = "myEntry", type = HttpParamType.COMMON, description = "我的入驻") String myEntry,
+							@HttpParam(name = "defaultEntry", type = HttpParamType.COMMON, description = "默认入驻") String defaultEntry,
 							@HttpParam(name = "status", type = HttpParamType.COMMON, description = "0.冻结 1.激活") Long status,
 							@HttpParam(name = "gmtCreate", type = HttpParamType.COMMON, description = "") Date gmtCreate,
 							@HttpParam(name = "gmtUpdate", type = HttpParamType.COMMON, description = "") Date gmtUpdate,

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/tourism/impl/CommonUserInfoServiceImpl.java

@@ -40,7 +40,7 @@ public class CommonUserInfoServiceImpl implements ICommonUserInfoService {
     }
 
     @Override
-    public Page<CommonUserInfo> list(String nickname, String password, String phone, String realname, Long shareCard, Long lookPage, Long autoAccept, Long status, Date gmtCreate, Date gmtUpdate, Long deleteFlag, Integer page, Integer limit) throws ServiceException {
+    public Page<CommonUserInfo> list(String nickname, String password, String phone, String realname, Long automaticSkip, String myEntry, String defaultEntry, Long status, Date gmtCreate, Date gmtUpdate, Long deleteFlag, Integer page, Integer limit) throws ServiceException {
         Wrapper<CommonUserInfo> wrapper = new EntityWrapper<CommonUserInfo>();
         if (!StringUtils.isEmpty(nickname)) {
             wrapper.eq("nickname", nickname);
@@ -54,14 +54,14 @@ public class CommonUserInfoServiceImpl implements ICommonUserInfoService {
         if (!StringUtils.isEmpty(realname)) {
             wrapper.eq("realname", realname);
         }
-        if (!StringUtils.isEmpty(shareCard)) {
-            wrapper.eq("share_card", shareCard);
+        if (!StringUtils.isEmpty(automaticSkip)) {
+            wrapper.eq("automatic_skip", automaticSkip);
         }
-        if (!StringUtils.isEmpty(lookPage)) {
-            wrapper.eq("look_page", lookPage);
+        if (!StringUtils.isEmpty(myEntry)) {
+            wrapper.eq("my_entry", myEntry);
         }
-        if (!StringUtils.isEmpty(autoAccept)) {
-            wrapper.eq("auto_accept", autoAccept);
+        if (!StringUtils.isEmpty(defaultEntry)) {
+            wrapper.eq("default_entry", defaultEntry);
         }
         if (!StringUtils.isEmpty(status)) {
             wrapper.eq("status", status);
@@ -109,7 +109,7 @@ public class CommonUserInfoServiceImpl implements ICommonUserInfoService {
     }
 
     @Override
-    public String export(String nickname, String password, String phone, String realname, Long shareCard, Long lookPage, Long autoAccept, Long status, Date gmtCreate, Date gmtUpdate, Long deleteFlag, Integer page, Integer limit) throws ServiceException {
+    public String export(String nickname, String password, String phone, String realname, Long automaticSkip, String myEntry, String defaultEntry, Long status, Date gmtCreate, Date gmtUpdate, Long deleteFlag, Integer page, Integer limit) throws ServiceException {
         Wrapper<CommonUserInfo> wrapper = new EntityWrapper<CommonUserInfo>();
         if (!StringUtils.isEmpty(nickname)) {
             wrapper.eq("nickname", nickname);
@@ -123,14 +123,14 @@ public class CommonUserInfoServiceImpl implements ICommonUserInfoService {
         if (!StringUtils.isEmpty(realname)) {
             wrapper.eq("realname", realname);
         }
-        if (!StringUtils.isEmpty(shareCard)) {
-            wrapper.eq("share_card", shareCard);
+        if (!StringUtils.isEmpty(automaticSkip)) {
+            wrapper.eq("automatic_skip", automaticSkip);
         }
-        if (!StringUtils.isEmpty(lookPage)) {
-            wrapper.eq("look_page", lookPage);
+        if (!StringUtils.isEmpty(myEntry)) {
+            wrapper.eq("my_entry", myEntry);
         }
-        if (!StringUtils.isEmpty(autoAccept)) {
-            wrapper.eq("auto_accept", autoAccept);
+        if (!StringUtils.isEmpty(defaultEntry)) {
+            wrapper.eq("default_entry", defaultEntry);
         }
         if (!StringUtils.isEmpty(status)) {
             wrapper.eq("status", status);

unimall-data/src/main/java/com/iotechn/unimall/data/domain/CommonUserInfo.java

@@ -1,16 +1,12 @@
 package com.iotechn.unimall.data.domain;
 
-import com.iotechn.unimall.data.domain.SuperDO;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.iotechn.unimall.core.framework.aspectj.lang.annotaion.Excel;
-import com.iotechn.unimall.core.framework.aspectj.lang.annotaion.Excel.ColumnType;
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
 import lombok.Data;
 import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.enums.FieldFill;
-import com.iotechn.unimall.core.util.StringUtils;
 import java.util.Date;
 
 /**
@@ -57,20 +53,20 @@ public class CommonUserInfo extends SuperDO {
     @TableField("head")
     private String head;
 
-    /** 允许他人分享名片(1允许) */
-    @Excel(name = "允许他人分享名片(1允许)")
-    @TableField("share_card")
-    private Long shareCard;
+    /** 自动跳转(1开启) */
+    @Excel(name = "自动跳转(1开启)")
+    @TableField("automatic_skip")
+    private Long automaticSkip;
 
-    /** 允许圈子成员查看主页(1允许) */
-    @Excel(name = "允许圈子成员查看主页(1允许)")
-    @TableField("look_page")
-    private Long lookPage;
+    /** 我的入驻 */
+    @Excel(name = "我的入驻")
+    @TableField("my_entry")
+    private Long myEntry;
 
-    /** 自动接受邀请(1是) */
-    @Excel(name = "自动接受邀请(1是)")
-    @TableField("auto_accept")
-    private Long autoAccept;
+    /** 默认入驻 */
+    @Excel(name = "默认入驻")
+    @TableField("default_entry")
+    private Long defaultEntry;
 
     /** 0.冻结 1.激活 */
     @Excel(name = "0.冻结 1.激活")
@@ -107,9 +103,9 @@ public class CommonUserInfo extends SuperDO {
             .append("password", getPassword())
             .append("phone", getPhone())
             .append("realname", getRealname())
-            .append("shareCard", getShareCard())
-            .append("lookPage", getLookPage())
-            .append("autoAccept", getAutoAccept())
+            .append("automaticSkip", getAutomaticSkip())
+            .append("myEntry", getMyEntry())
+            .append("defaultEntry", getDefaultEntry())
             .append("status", getStatus())
             .append("gmtCreate", getGmtCreate())
             .append("gmtUpdate", getGmtUpdate())