Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/sg/mapper/xml/JkxlMapper.xml

@@ -60,6 +60,7 @@
          b.jx_cost as jxCost,
          b.measures_fee1 as measuresFee1,
          b.measures_fee2 as measuresFee2,
+		 b.measures_fee3 as measuresFee3,
          b.other_cost as otherCost,
          b.tex as tex,
          b.fees as fees,
@@ -111,6 +112,7 @@
 		 jx_cost,
 		 measures_fee1,
 		 measures_fee2,
+		 measures_fee3,
 		 other_cost,
 		 fees,
 		 tex,
@@ -137,6 +139,7 @@
 		 #{jxCost},
 		 #{measuresFee1},
 		 #{measuresFee2},
+		 #{measuresFee3},
 		 #{otherCost},
 		 #{fees},
 		 #{tex},
@@ -173,6 +176,9 @@
 		      <if test="measuresFee2 != null and measuresFee2 != ''">
 				  measures_fee2 = #{measuresFee2},
 		     </if>
+		     <if test="measuresFee3 != null and measuresFee3 != ''">
+			       measures_fee3 = #{measuresFee3},
+		     </if>
 		     <if test="otherCost != null and otherCost != ''">
 				 other_cost = #{otherCost},
 		     </if>

src/main/webapp/webpage/modules/sg/free/wbslist.jsp

@@ -154,7 +154,7 @@
 
                     "csf_1": "${data.measuresFee1}",
                     "csf_2": "${data.measuresFee2}",
-                    "csf2": "${data.measuresFee3}",
+                    "csf2": "<c:if test="${ empty data.measuresFee3 and not empty data.originalTotalCost}">0.0</c:if><c:if test="${ not empty data.measuresFee3}">${data.measuresFee3}</c:if>",
                     "qtf":"${data.otherCost}",
                     "gf":"${data.fees}",
                     "sf":"${data.tex}",