Merge remote-tracking branch 'origin/master'

liujie

2023-05-26 89ea5267bd4b4f5540b5eb3961c7c8ef3859a225

 src/main/java/com/stylefeng/guns/modular/system/model/OrderInfo.java

@@ -78,6 +78,8 @@

    private Integer state;

    private Integer goodsId;

    private String status;

}