Merge branch 'feature-commodity-0901-v1' into release-20170915

src/main/java/com/uas/platform/b2c/prod/product/component/modal/ComponentGoods.java

@@ -64,6 +64,12 @@ public class ComponentGoods implements Serializable {
 	@Column(name = "cmp_uuid")
 	private String uuid;
 
+	/**
+	 * 是否拆卖
+	 */
+	@Column(name = "go_isbreakup")
+	private Boolean breakUp;
+
 	/**
 	 * 批次号
 	 */
@@ -654,4 +660,13 @@ public class ComponentGoods implements Serializable {
 		this.b2cDeliveryDemMaxTime = b2cDeliveryDemMaxTime;
 		return this;
 	}
+
+	public Boolean getBreakUp() {
+		return breakUp;
+	}
+
+	public ComponentGoods setBreakUp(Boolean breakUp) {
+		this.breakUp = breakUp;
+		return this;
+	}
 }

src/main/webapp/resources/view/vendor/forstore/vendor_onSale.html

@@ -223,14 +223,14 @@
         border-bottom: #cfcfcf 1px solid;
     }
     .record-line{
-        height: 30px;
+        /*height: 30px;*/
         font-size: 12px;
         line-height: 35px;
         /* margin-top: 5px; */
         padding-right: 22px
     }
     .wanted_list01 .pagination{
-        margin: 15px 0;
+        margin: 0;
     }
     .ng-table-pager{
         padding-bottom: 20px;

src/main/webapp/resources/view/vendor/modal/releaseProductByBatchTip.html

@@ -20,7 +20,7 @@
 			<div class="col-xs-12">1.标题红色为必填项，黑色为选填项</div>
 			<div class="col-xs-12">2.最小包装数量不填时默认为1</div>
 			<div class="col-xs-12">3.最小起订量不填时默认等于最小包装数量</div>
-			<div class="col-xs-12">4.不可拆卖时，最小起订量应为最小保障数量的倍数</div>
+			<div class="col-xs-12">4.不可拆卖时，最小起订量应为最小包装数量的倍数</div>
 			<div class="col-xs-12">5.价格分段不填写时默认存在一个分段，分段数量为1-999999999，价格为单价</div>
 		</p>
 		<p class="col-xs-12">