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

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

@@ -43,7 +43,7 @@ public interface ICommonUserInfoService{
 	public Boolean delete(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "")String id)throws ServiceException;
 
 	@HttpMethod(description = "修改",  permissionName = "用户管理管理")
-	public Boolean update(@NotNull @HttpParam(name = "commonUserInfo", type = HttpParamType.COMMON, description = "用户管理") CommonUserInfo commonUserInfo)throws ServiceException;
+	public CommonUserInfo update(@NotNull @HttpParam(name = "commonUserInfo", type = HttpParamType.COMMON, description = "用户管理") CommonUserInfo commonUserInfo)throws ServiceException;
 
 	@HttpMethod(description = "查询", permissionName = "用户管理管理")
 	public CommonUserInfo get(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "")Long id)throws ServiceException;

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

@@ -98,10 +98,11 @@ public class CommonUserInfoServiceImpl implements ICommonUserInfoService {
     }
 
     @Override
-    public Boolean update(CommonUserInfo commonUserInfo) throws ServiceException {
+    public CommonUserInfo update(CommonUserInfo commonUserInfo) throws ServiceException {
         Date now = new Date();
         commonUserInfo.setGmtUpdate(now);
-        return commonUserInfoMapper.updateById(commonUserInfo) > 0;
+        commonUserInfoMapper.updateById(commonUserInfo);
+        return commonUserInfo;
     }
 
     @Override

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

@@ -58,6 +58,11 @@ public class CommonUserInfo extends SuperDO {
     @TableField("automatic_skip")
     private Long automaticSkip;
 
+    /** 自动跳转模块 */
+    @Excel(name = "自动跳转模块")
+    @TableField("auto_module")
+    private String autoModule;
+
     /** 入驻餐饮数 */
     @Excel(name = "入驻餐饮数")
     @TableField("food_entry")