Merge branch '瑞丰相关接口改造' into test

# Conflicts:
#	order-management-consumer/src/main/resources/bootstrap-test.yaml

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

@@ -3556,6 +3556,7 @@ public class BeanTransitionUtils {
             ddtxxBO.setPZGZRQ(req.getZGZRQ());
             ddtxxBO.setYZFP(ConfigureConstant.STRING_0);
             ddtxxBO.setORIGINDDH(req.getZJSDH());
+            ddtxxBO.setBZ(req.getZZBZ());
             ddtxxBO.setKB(ObjectUtil.isNull(req.getITITEM().get(0).getKTYPE())?"":req.getITITEM().get(0).getKTYPE()+(ObjectUtil.isNull(req.getITITEM().get(0).getKNAME())?"":req.getITITEM().get(0).getKNAME()));
             //清单标志先赋值成0，没有农产品业务，成品油的人工拆分出来做处理
             ddtxxBO.setQDBZ("0");

order-management-consumer/src/main/resources/bootstrap-test.yaml

@@ -4,8 +4,8 @@ spring:
     nacos:
       config:
         # Nacos config 地址
+#        server-addr: 172.31.36.143:33000
         server-addr: 172.31.36.146:33000
-        #server-addr: 172.31.36.147:33000
         # Nacos config 命名空间,对应配置中的名称(sims_order_namespace)
         namespace: a049b41c-b0a8-4a66-91b1-f3f3cab0e524
         # Nacos config 分组