Merge remote-tracking branch 'origin/dev' into dev

src/main/webapp/HG/CG/HGCG003B.jsp

@@ -51,6 +51,9 @@
 			             sumType="page"/>
 			<EF:EFColumn ename="receiveUnitWeight" cname="收货单重" enable="false" width="120" align="right" format="{0:N3}"
 			             hidden="true"/>
+			<EF:EFComboColumn ename="calculationMethod" cname="计算方式" enable="true" width="100" align="center" required="true">
+				<EF:EFCodeOption codeName="hggp.cg.calculationMethod" />
+			</EF:EFComboColumn>
 			<EF:EFColumn ename="price" cname="单价" width="120" align="right" format="{0:C3}" required="true"/>
 			<EF:EFColumn ename="amount" cname="金额" enable="false" width="120" align="right" format="{0:C3}"
 			             sumType="page"/>