Merge remote-tracking branch 'origin/master'

CBin

2023-08-02 88b0f7ea048e9b201af0bc390f3da8840b11c899

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

@@ -31,7 +31,7 @@
     * 完结id
     */
    @TableId("finish_id")
    private Integer finishId;
    private Long finishId;
    /**
     * 删除标记
     */
@@ -41,7 +41,7 @@
     * 商户id
     */
    @TableField("shop_id")
    private Integer shopId;
    private Long shopId;
    /**
     * 订单id
     */