朱园亮 / xingyun-erp · Commits

Commit 78a285d4e84fe356e9f2ebbfaa2e47262b701eaa

Authored by 房远帅
2 parents eda4d04d a126662f

Merge branch 'master_chujiang_0731' into master_chujiang_0805

Inline Side-by-side
Showing 1 changed file with 12 additions and 0 deletions
... ... @@ -214,6 +214,12 @@ public class ShipmentDetailStatisticsModel implements ExcelModel {
214 214 private String remark;
215 215
216 216 /**
  217 + * 备注一
  218 + */
  219 + @ExcelProperty("备注一")
  220 + private String remark1;
  221 +
  222 + /**
217 223 * 结算方式
218 224 */
219 225 @ExcelProperty("结算方式")
... ... @@ -286,6 +292,12 @@ public class ShipmentDetailStatisticsModel implements ExcelModel {
286 292 private String variety;
287 293
288 294 /**
  295 + * 备注二
  296 + */
  297 + @ExcelProperty("备注二")
  298 + private String remark2;
  299 +
  300 + /**
289 301 * 客户简称
290 302 */
291 303 @ExcelProperty("客户简称")
... ...