Merge branch 'master' of ssh://sinata.cn:20202/java/HongRuiTang into master

jiangqs

2023-05-10 7a49bcc5e561df7a9b65266a57a9c0896c0fd3d0

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/order/Order.java

@@ -150,6 +150,11 @@
     */
    @TableField("goods_num")
    private Integer goodsNum;
    /**
     * 结清标记
     */
    @TableField("close_flag")
    private Integer closeFlag;

    @Override
    protected Serializable pkVal() {