Merge remote-tracking branch 'origin/test-zhy0721' into test

order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java

@@ -3618,8 +3618,8 @@ public class BeanTransitionUtils {
                 ddmxxxBO.setPH(detail.getCHARG());
                 ddmxxxBO.setKB(ObjectUtil.isNull(detail.getKTYPE())?"":detail.getKTYPE()+(ObjectUtil.isNull(detail.getKNAME())?"":detail.getKNAME()));
                 BigDecimal decimal = new BigDecimal("0");
-                if(StringUtils.isNotBlank(ddmxxxBO.getJE()) && decimal.compareTo(new BigDecimal(ddmxxxBO.getJE())) == 0) {
-                    ddmxxxBO.setJE("");
+                if(StringUtils.isNotBlank(ddmxxxBO.getDJ()) && decimal.compareTo(new BigDecimal(ddmxxxBO.getDJ())) == 0) {
+                    ddmxxxBO.setDJ("");
                 } else if (StringUtils.isNotBlank(ddmxxxBO.getSPSL()) && decimal.compareTo(new BigDecimal(ddmxxxBO.getSPSL())) == 0) {
                     ddmxxxBO.setSPSL("");
                 }