 zty
|
baaead47b6
Merge branch 'Release2.5' of http://36.129.163.148:30080/gogsadmin/OTS into zty
|
%!s(int64=2) %!d(string=hai) anos |
 cxs
|
bc3ab09ace
1.重新梳理颗粒列表数据源类型，添加拼接颗粒子列表
|
%!s(int64=2) %!d(string=hai) anos |
|
zty
|
51ddcd9106
添加缺失的代码
|
%!s(int64=2) %!d(string=hai) anos |
|
cxs
|
f5f0b2549a
报告添加导入数据库功能
|
%!s(int64=3) %!d(string=hai) anos |
|
zty
|
92afa09f46
添加二次采集功能
|
%!s(int64=3) %!d(string=hai) anos |
 zty
|
f409fb4728
添加特殊颗粒处理页面
|
%!s(int64=3) %!d(string=hai) anos |
 CXS
|
9680c65288
Merge branch 'dev' into cxs
|
%!s(int64=3) %!d(string=hai) anos |
|
zty
|
bea5a60ab0
更新部分代码
|
%!s(int64=3) %!d(string=hai) anos |
|
CXS
|
e99eedf168
合并解决冲突
|
%!s(int64=3) %!d(string=hai) anos |
|
CXS
|
bffa59ea53
Merge branch 'dev' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into dev
|
%!s(int64=3) %!d(string=hai) anos |
|
zty
|
9269eac592
修改报告Model位置
|
%!s(int64=3) %!d(string=hai) anos |
 zhangjiaxin
|
bc43d2bc6c
报告程序从数据中删除选中颗粒（未完成临时）
|
%!s(int64=3) %!d(string=hai) anos |
|
zhangjiaxin
|
d90d4506c3
Merge branch 'dev' into ZJX
|
%!s(int64=3) %!d(string=hai) anos |
 gsp
|
9e20032f53
make a refactor on reportapp code structure.
|
%!s(int64=3) %!d(string=hai) anos |
