Merge remote-tracking branch 'origin/2.0' into 2.0

zhibing.pu

2024-08-23 1e630a0e74dab5ae9e2704de890bbb16b951ec99

 ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TIntegralOrder.java

@@ -64,6 +64,7 @@
     * 状态 1=未处理 2=已处理 3=已删除
     */
    private Integer state;
    private Integer integral;
    private String manageRemark;