Просмотр исходного кода

[物业合同][物业押金][添加][字段]

release_toaliyun_real
gongbiao 7 лет назад
Родитель
Сommit
e017d5f40e
3 измененных файлов: 22 добавлений и 6 удалений
  1. +4
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantController.java
  2. +9
    -2
      mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java
  3. +9
    -2
      mallinkService/src/main/java/com/iformall/domain/po/WxBillPropertyDeposit.java

+ 4
- 2
mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantController.java Просмотреть файл

@@ -17,6 +17,9 @@ import org.springframework.web.bind.annotation.*;

import java.util.List;

/**
* @author gongbiao
*/
@RestController
@RequestMapping("wxMerchant")
public class WxMerchantController extends BaseController {
@@ -77,8 +80,7 @@ public class WxMerchantController extends BaseController {
@GetMapping("/findById")
@ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true)
public ResultData findById(Long id) {
WxMerchant wxMerchant = new WxMerchant();
wxMerchant = wxMerchantService.getById(id);
WxMerchant wxMerchant = wxMerchantService.getById(id);
if (wxMerchant != null) {
WxProfitSharingReceiver receiver = wxProfitSharingReceiverService.findReceiver(wxMerchant);
if (receiver != null){


+ 9
- 2
mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java Просмотреть файл

@@ -36,8 +36,9 @@ public class WxBillProperty implements Serializable {
public void setIds(List<Long> ids) {
this.ids = ids;
}

@Transient
private String merchantName;
/*租金合同ID**/
@io.swagger.annotations.ApiModelProperty(value="租金合同ID",name="rentContractId")
@@ -184,7 +185,13 @@ public class WxBillProperty implements Serializable {
updatetime = _updatetime;
}

public String getMerchantName() {
return merchantName;
}

public void setMerchantName(String merchantName) {
this.merchantName = merchantName;
}

public static enum Field
{


+ 9
- 2
mallinkService/src/main/java/com/iformall/domain/po/WxBillPropertyDeposit.java Просмотреть файл

@@ -36,8 +36,9 @@ public class WxBillPropertyDeposit implements Serializable {
public void setIds(List<Long> ids) {
this.ids = ids;
}

@Transient
private String merchantName;
/*租金合同ID**/
@io.swagger.annotations.ApiModelProperty(value="租金合同ID",name="rentContractId")
@@ -184,7 +185,13 @@ public class WxBillPropertyDeposit implements Serializable {
updatetime = _updatetime;
}

public String getMerchantName() {
return merchantName;
}

public void setMerchantName(String merchantName) {
this.merchantName = merchantName;
}

public static enum Field
{


Загрузка…
Отмена
Сохранить