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

Pu Zhibing

2024-10-10 ad79642adf7d56b1c54898ce971a976683a88dd3

 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;