Sfoglia il codice sorgente

Merge branch 'release_real_202010' of https://git.malls.iformall.com/server/formallProject into release_real_202010

release_toaliyun_real
xhxu 5 anni fa
parent
commit
998722c9b5
2 ha cambiato i file con 3 aggiunte e 1 eliminazioni
  1. +2
    -0
      mallinkService/src/main/java/com/iformall/domain/vo/WxCardSpendVo.java
  2. +1
    -1
      mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml

+ 2
- 0
mallinkService/src/main/java/com/iformall/domain/vo/WxCardSpendVo.java Vedi File

@@ -4,6 +4,7 @@ import cn.afterturn.easypoi.excel.annotation.Excel;


import java.util.List; import java.util.List;


import com.baomidou.mybatisplus.annotation.TableField;
import com.iformall.domain.po.WxCardSpend; import com.iformall.domain.po.WxCardSpend;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
@@ -40,6 +41,7 @@ public class WxCardSpendVo extends WxCardSpend {
private String ouPhone; private String ouPhone;
@io.swagger.annotations.ApiModelProperty(value="账单来源查询条件",name="ouPhone") @io.swagger.annotations.ApiModelProperty(value="账单来源查询条件",name="ouPhone")
@TableField(exist = false)
private List<Integer> sources; private List<Integer> sources;


} }

+ 1
- 1
mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml Vedi File

@@ -325,7 +325,7 @@
cs.`card_remain_amount`,cs.`card_before_amount`,cs.`card_remain_real_amount`,cs.`card_before_real_amount`, cs.`card_remain_amount`,cs.`card_before_amount`,cs.`card_remain_real_amount`,cs.`card_before_real_amount`,
cs.`create_date`,cs.`update_date`, cs.`pay_status`, cs.`create_date`,cs.`update_date`, cs.`pay_status`,
m.`name`, c.`title`, m.`name`, c.`title`,
ms.`subsidy`,ms.`real_subsidy`,ms.`status`
ms.`subsidy`,ms.`real_subsidy`,ms.`status`,
ou.`nick_name` as onick_name, ou.`phone` as ou_phone ou.`nick_name` as onick_name, ou.`phone` as ou_phone
</sql> </sql>




Caricamento…
Annulla
Salva