nacos 默认密码修改

福达增加检索条件

blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java

@@ -74,12 +74,12 @@ public interface LauncherConstant {
 	/**
 	 * nacos prod 地址
 	 */
-	String NACOS_PROD_ADDR = "121.37.83.47:8848";
+	String NACOS_PROD_ADDR = "127.0.0.1:8848";
 
 	/**
 	 * nacos test 地址
 	 */
-	String NACOS_TEST_ADDR = "121.37.83.47:8848";
+	String NACOS_TEST_ADDR = "127.0.0.1:8848";
 
 	/**
 	 * nacos dev 用戶名
@@ -101,17 +101,17 @@ public interface LauncherConstant {
 	/**
 	 * nacos dev 用戶名
 	 */
-	String NACOS_DEV_PASSWORD = "tbnacos123";
+	String NACOS_DEV_PASSWORD = "SXwylljp@123";
 
 	/**
 	 * nacos prod 用戶名
 	 */
-	String NACOS_PROD_PASSWORD = "tbnacos123";
+	String NACOS_PROD_PASSWORD = "SXwylljp@123";
 
 	/**
 	 * nacos test 用戶名
 	 */
-	String NACOS_TEST_PASSWORD = "tbnacos123";
+	String NACOS_TEST_PASSWORD = "SXwylljp@123";
 
 
 	/**

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/export/ExportOrderController.java

@@ -158,7 +158,7 @@ public class ExportOrderController extends BladeController {
 		} else if ("4".equals(order.getTabType())) {
 			lambdaQueryWrapper.eq(Order::getOrderStatus, "录入");
 		} else {
-
+			lambdaQueryWrapper.eq(ObjectUtils.isNotNull(order.getOrderStatus()),Order::getOrderStatus, order.getOrderStatus());
 		}
 		lambdaQueryWrapper.orderByDesc(Order::getId);
 		IPage<Order> page = orderService.page(Condition.getPage(query), lambdaQueryWrapper);