Commit b4fd94e1 by huiyang.chen

fix 合并

parent 6dd43341
...@@ -131,6 +131,7 @@ public class ProductVo { ...@@ -131,6 +131,7 @@ public class ProductVo {
* 商品单位 * 商品单位
*/ */
private String unit; private String unit;
private String couponName;
/** /**
* 1.5.5版本添加 * 1.5.5版本添加
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment