浏览代码

Merge branch 'ETA_1.1.5' into debug

ziwen 1 年之前
父节点
当前提交
0c54cdda33
共有 1 个文件被更改,包括 1 次插入1 次删除
  1. 1 1
      models/sandbox/sandbox.go

+ 1 - 1
models/sandbox/sandbox.go

@@ -196,7 +196,7 @@ type SandboxListItem struct {
 // GetList 获取沙盘列表页
 // GetList 获取沙盘列表页
 func GetList(condition string, pars []interface{}, startSize, pageSize int) (total int, list []*Sandbox, err error) {
 func GetList(condition string, pars []interface{}, startSize, pageSize int) (total int, list []*Sandbox, err error) {
 	o := orm.NewOrmUsingDB("data")
 	o := orm.NewOrmUsingDB("data")
-	sql := "select a.sandbox_id,a.name,a.code,a.pic_url,a.op_user_id,a.op_user_name,a.modify_time,a.create_time from sandbox as a where 1=1 AND a.is_delete = 0 "
+	sql := "select a.sandbox_id,a.name,a.code,a.pic_url,a.sys_user_id,a.sys_user_name,a.modify_time,a.create_time from sandbox as a where 1=1 AND a.is_delete = 0 "
 	sql += condition
 	sql += condition
 	sql += ` order by a.modify_time desc,a.sandbox_id desc`
 	sql += ` order by a.modify_time desc,a.sandbox_id desc`