Merge remote-tracking branch 'origin/master'

linwei

2024-01-24 e20d75414b3c2bca00fb4d780fc3445c9df09197

 src/main/java/org/springblade/modules/property/vo/PropertyCompanyDetailVO.java

@@ -19,6 +19,8 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.modules.pay.entity.AliPayInfo;
import org.springblade.modules.pay.entity.WxPayInfo;
import org.springblade.modules.property.entity.PropertyCompanyEntity;

import java.util.ArrayList;
@@ -51,4 +53,11 @@
    */
   private List<PropertyDistrictUserVO> districtUserVOS  = new ArrayList<>();


   //微信商户
   private WxPayInfo wxPayInfo;

   //支付宝商户
   private AliPayInfo aliPayInfo;

}