Commit c08a3239 authored by xiangjiaojunxp's avatar xiangjiaojunxp

物资详情模块

parent d4d3aca2
......@@ -5,7 +5,6 @@ import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.system.domain.ActSuppliesTemplate;
import com.ruoyi.system.domain.SysSupplies;
import com.ruoyi.system.service.ISysSuppliesService;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -33,12 +32,11 @@ public class SysSuppliesController extends BaseController
*/
@PreAuthorize("@ss.hasPermi('system:supplies:list')")
@GetMapping("/list")
public TableDataInfo list(ActSuppliesTemplate sysSupplies)
public TableDataInfo list(SysSupplies sysSupplies)
{
startPage();
List<SysSupplies> list = iSysSuppliesService.list();
return getDataTable(list);
}
/**
* 保存物资管理列表
......
......@@ -8,7 +8,7 @@ spring:
master:
url: jdbc:mysql://localhost:3306/hbghgz_sc?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
password: 123456
password: root
# 从库数据源
slave:
# 从数据源开关/默认关闭
......
......@@ -8,7 +8,7 @@ spring:
master:
url: jdbc:mysql://localhost:3306/hbghgz_sc?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
username: root
password: 123456
password: root
# 从库数据源
slave:
# 从数据源开关/默认关闭
......
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<!-- 日志存放路径 -->
<property name="log.path" value="H:/Project/java/klck/klck/hbghgz/logs" />
<property name="log.path" value="D:/develop/idea-workspace/klbsxt/hbghgz/logs" />
<!-- 日志输出格式 -->
<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment