FengChaoYu hai 9 meses
pai
achega
280fe38549

+ 2 - 2
mall-server-api/src/main/java/com/gree/mall/manager/bean/engin/EnginPayManageImport.java

@@ -16,8 +16,8 @@ public class EnginPayManageImport {
     @ApiModelProperty(value = "商户编号")
     private String companyWechatId;
 
-//    @ApiModelProperty(value = "商户名称")
-//    private String companyWechatName;
+    @ApiModelProperty(value = "商户名称")
+    private String companyWechatName;
 
     @ApiModelProperty(value = "网点编号")
     private String websitId;

+ 5 - 5
mall-server-api/src/main/java/com/gree/mall/manager/bean/workorder/SettlePoolWorkerVO.java

@@ -17,11 +17,11 @@ public class SettlePoolWorkerVO {
     @ApiModelProperty(value = "月份")
     private String month;
 
-//    @ApiModelProperty(value = "商户编号")
-//    private String companyWechatId;
-//
-//    @ApiModelProperty(value = "商户名称")
-//    private String companyWechatName;
+    @ApiModelProperty(value = "商户编号")
+    private String companyWechatId;
+
+    @ApiModelProperty(value = "商户名称")
+    private String companyWechatName;
 
     @ApiModelProperty(value = "网点编号")
     private String websitId;