Merge remote-tracking branch 'TSIT/ST24PRJ-714' into develop

src/main/java/com/style24/admin/biz/service/TsaGoodsService.java

@@ -3750,7 +3750,9 @@ public class TsaGoodsService {
 			goods.setGoodsStat("10");
 			return goods;
 		}
-		if (!UPDATE_NO_PATTERN.equals(goodsMass.getPntPrate().trim())) {
+		if (UPDATE_NO_PATTERN.equals(goodsMass.getPntPrate().trim())) {
+			goods.setPntPrate(goodsOrigin.getPntPrate());
+		} else {
 			try {
 				float pntPrate = Float.valueOf(goodsMass.getPntPrate().trim());
 				goods.setPntPrate(pntPrate);
@@ -3783,7 +3785,9 @@ public class TsaGoodsService {
 			goods.setGoodsStat("10");
 			return goods;
 		}
-		if (!UPDATE_NO_PATTERN.equals(goodsMass.getPntMrate().trim())) {
+		if (UPDATE_NO_PATTERN.equals(goodsMass.getPntMrate().trim())) {
+			goods.setPntMrate(goodsOrigin.getPntMrate());
+		} else {
 			try {
 				int pntMrate = Integer.parseInt(goodsMass.getPntMrate().trim());
 				goods.setPntMrate(pntMrate);