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

Merge tag 'refs/tags/jenkins-back-end-1796' into release

develop
release_toaliyun_real
luozukai 7 лет назад
Родитель
Сommit
b2b34ed9a7
2 измененных файлов: 6 добавлений и 3 удалений
  1. +1
    -1
      mallinkService/src/main/java/com/iformall/common/ErrorCode.java
  2. +5
    -2
      mallinkService/src/main/java/com/iformall/domain/vo/WxBillDailyVo.java

+ 1
- 1
mallinkService/src/main/java/com/iformall/common/ErrorCode.java Просмотреть файл

@@ -296,7 +296,7 @@ public enum ErrorCode{
/**
* 会员
*/
MEM_IMPORT_ERR(13000, "模板导入失败,请检查数据,尝试重新导入"),
MEM_IMPORT_ERR(13000, "数据导入失败,请检查数据,尝试重新导入"),
MEM_SCORE_NOT_ENOUGH(13001, "成长值不够扣减值"),
CREDIT_ZERO(13100,"本次操作积分为零"),
CREDIT_NOT_ENOUGH(13101, "积分不够扣减值"),


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

@@ -7,6 +7,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;

import javax.validation.constraints.Digits;
import javax.validation.constraints.NotNull;

/**
@@ -22,13 +23,15 @@ public class WxBillDailyVo extends WxBillDaily {
@io.swagger.annotations.ApiModelProperty(value = "商铺号", name = "shopNumber")
private String shopNumber;

@Excel(name = "实际应收金额(元)*", orderNum = "3", width = 20, numFormat = "#.##")
@Excel(name = "实际应收金额(元)*", orderNum = "3", width = 20, numFormat = "#.##", type = 10)
@NotNull
@Digits(integer = 10, fraction = 2)
@io.swagger.annotations.ApiModelProperty(value = "实际应收金额", name = "receivePayStr")
private String receivePayStr;

@Excel(name = "实收金额(元)*", orderNum = "4", width = 20, numFormat = "#.##")
@Excel(name = "实收金额(元)*", orderNum = "4", width = 20, numFormat = "#.##", type = 10)
@NotNull
@Digits(integer = 10, fraction = 2)
@io.swagger.annotations.ApiModelProperty(value = "实收金额", name = "payStr")
private String payStr;



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