Merge remote-tracking branch 'origin/master'

yaowanxin

昨天 3a76f9efb61f7bdbf96dfa429214ee0c8322a539

 src/main/java/com/ruoyi/account/controller/AccountExpenseController.java

@@ -11,6 +11,8 @@
import com.ruoyi.dto.DateQueryDto;
import com.ruoyi.framework.security.LoginUser;
import com.ruoyi.framework.web.domain.AjaxResult;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;

@@ -24,6 +26,7 @@
 */
@RestController
@RequestMapping("/account/accountExpense")
@Api(tags = "财务管理--支出管理")
public class AccountExpenseController {

    @Resource
@@ -112,6 +115,16 @@
    }

    /**
     * 财务报表-财务分析
     * @return
     */
    @GetMapping("/report/analysis")
    @ApiOperation("财务报表-财务分析")
    public AjaxResult analysis() {
        return AjaxResult.success(accountExpenseService.analysis());
    }

    /**
     * 财务报表图表收入年度查询
     * @param
     * @return