feat: 修复代码冲突

hjl

2024-06-06 c62e9f81b2072473b084abb30f7c005ed341a336

 ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/domain/TSysSet.java

@@ -53,4 +53,8 @@
     * 积分设置 可获积分
     */
    private String integral;
    /**
     * 每日分享可获积分
     */
    private String integralShare;
}