Browse Source

no message

FengChaoYu 1 week ago
parent
commit
3a7f10f47b

+ 1 - 13
src/main/java/com/gree/mall/manager/bean/admin/AdminWebsitVO.java

@@ -1,14 +1,8 @@
 package com.gree.mall.manager.bean.admin;
 
-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.gree.mall.manager.annotation.ZfireField;
 import com.gree.mall.manager.enums.IsYesNoEnum;
 import com.gree.mall.manager.enums.StateEnum;
-import com.gree.mall.manager.enums.StatusEnum;
-import com.gree.mall.manager.plus.entity.AdminWebsit;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -27,7 +21,7 @@ public class AdminWebsitVO {
 
     @ZfireField(hide = true)
     @ApiModelProperty(value = "商户id")
-    private String companyWechatId;
+    private String companyId;
 
     @ApiModelProperty(value = "上级公司")
     private String companyName;
@@ -58,7 +52,6 @@ public class AdminWebsitVO {
     @ApiModelProperty(value = "师傅收款电子支付商户")
     private String payWorkerCodeId;
 
-
     @ApiModelProperty(value = "云闪付appid")
     private String yunAppid;
 
@@ -83,20 +76,15 @@ public class AdminWebsitVO {
     @ApiModelProperty(value = "云闪付是否O2O")
     private IsYesNoEnum yunTwo;
 
-
     @ApiModelProperty(value = "创建时间")
-    @TableField(fill = FieldFill.INSERT)
     private Date createTime;
 
     @ApiModelProperty(value = "创建人")
-    @TableField(fill = FieldFill.INSERT)
     private String createBy;
 
     @ApiModelProperty(value = "修改人")
-    @TableField(fill = FieldFill.INSERT_UPDATE)
     private String updateBy;
 
     @ApiModelProperty(value = "修改时间")
-    @TableField(fill = FieldFill.INSERT_UPDATE)
     private Date updateTime;
 }

+ 1 - 1
src/main/java/com/gree/mall/manager/logic/admin/AdminWebsitLogic.java

@@ -260,7 +260,7 @@ public class AdminWebsitLogic {
         AdminUserCom adminUser = commonLogic.getAdminUser();
 
         //1.组装查询条件
-        FieldUtils.supplyParam(zfireParam, AdminWebsitVO.class,adminUser);
+        FieldUtils.supplyParam(zfireParam, AdminWebsitVO.class, adminUser);
 
         IPage<AdminWebsitVO> adminDeptWebsitVOIPage = adminMapper.listWebsit(page, zfireParam);
         return adminDeptWebsitVOIPage;