 zhangxin
|
338144a9b3
|
返回结构体中添加字段Uom
|
3 years ago |
|
zhangxin
|
44d7eccb72
|
添加字段Uom
|
3 years ago |
 娄文智
|
378ae2a70f
|
Merge pull request '添加定期清理供应商门户和workOrder模块中A30生成的数据的程序' (#340) from feature_portal into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/340
Reviewed-by: 娄文智 <wenzhi.lou@le-it.com.cn>
|
3 years ago |
|
zhangxin
|
6febc17087
|
添加清理老数据的方法
|
3 years ago |
|
zhangxin
|
9affb3fa7e
|
添加定期清理供应商门户和workOrder模块中A30生成的数据的程序
|
3 years ago |
|
zhangxin
|
9662175aa2
|
Merge pull request 'schuduler排程 移动' (#339) from fix_schedulerMove into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/339
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
|
娄文智
|
c11437be9e
|
schuduler排程 移动
|
3 years ago |
|
zhangxin
|
9c6f381476
|
Merge pull request '修正了处理登录时发生的错误' (#338) from fix_Messaging into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/338
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
 allanwei
|
0338c74e9c
|
修正了处理登录时发生的错误
|
3 years ago |
|
娄文智
|
3824bd50b7
|
Merge pull request '调整额了WebSocket实现' (#337) from feature_Messing into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/337
Reviewed-by: 娄文智 <wenzhi.lou@le-it.com.cn>
|
3 years ago |
|
allanwei
|
1fd721f401
|
1.修正了获取WebSocket上下文的功能
2.实现了二次认证的功能
|
3 years ago |
|
zhangxin
|
c7ec04d2d3
|
Merge pull request '集成了WebSocket组件' (#336) from feature_WebSocket into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/336
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
|
allanwei
|
321b6d0186
|
集成了WebSocket组件
|
3 years ago |
|
weichenglei
|
61faae13cc
|
Merge pull request '添加弧焊机统计数据返回结构体useField字段' (#335) from feature_report into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/335
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>
|
3 years ago |
|
zhangxin
|
1630d0661f
|
添加弧焊机统计数据返回结构体useField字段
|
3 years ago |
|
weichenglei
|
9e7c2653a7
|
Merge pull request '修改创建解析portal db任务的时间和限制状态' (#334) from fix_portal into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/334
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>
|
3 years ago |
|
zhangxin
|
5e4ff94564
|
修改创建解析portal db任务的时间和限制状态
|
3 years ago |
|
weichenglei
|
a3d93652fc
|
Merge pull request '添加弧焊机统计数据展示功能' (#333) from feature_report into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/333
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>
|
3 years ago |
|
zhangxin
|
1c4ceb4651
|
添加弧焊机统计数据展示接口不需要校验token
|
3 years ago |
|
zhangxin
|
0ad10c939c
|
添加弧焊机统计数据展示功能
|
3 years ago |
|
zhangxin
|
e705add29b
|
Merge pull request '添加了自动生成代码' (#331) from feature_NewCode into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/331
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
|
allanwei
|
79622ea08e
|
添加了自动生成代码
|
3 years ago |
|
zhangxin
|
fd616d49e0
|
Merge pull request '全字段更新' (#329) from fix_portalUP into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/329
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
|
娄文智
|
c457bbddaa
|
全字段更新
|
3 years ago |
|
weichenglei
|
0d69b1929c
|
Merge pull request '删除掉无用代码和注释掉未调试代码' (#328) from fix_portal into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/328
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>
|
3 years ago |
|
zhangxin
|
f79904a241
|
注释未调试代码
|
3 years ago |
|
zhangxin
|
8f05ce83bb
|
删除无用文件
|
3 years ago |
|
zhangxin
|
0b686fc05a
|
Merge pull request '添加了自动生成代码' (#327) from feature_NewCode into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/327
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
|
allanwei
|
262376ff2e
|
添加了自动生成代码
|
3 years ago |
|
zhangxin
|
44e26e8b60
|
Merge pull request '添加了自动生成代码' (#326) from feature_NewCode into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/326
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
|
allanwei
|
eeabbaccb2
|
添加了自动生成代码
|
3 years ago |
|
zhangxin
|
3293ba63fa
|
Merge pull request 'portal更新数据缓存' (#325) from fix_portalUp into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/325
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
|
娄文智
|
fe4dabaf35
|
portal更新数据缓存
|
3 years ago |
|
zhangxin
|
81792fac18
|
Merge pull request '添加了自动生成代码' (#324) from feature_NewCode into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/324
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
|
allanwei
|
ac572e7be1
|
添加了自动生成代码
|
3 years ago |
|
weichenglei
|
b495f1c6d6
|
Merge pull request '修改生成planresourceid的逻辑' (#323) from fix_portal into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/323
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>
|
3 years ago |
|
zhangxin
|
f575c3c2d0
|
修改生成planresourceid的逻辑
|
3 years ago |
|
weichenglei
|
e6e426f8dd
|
Merge pull request '按名称收索和查询' (#322) from fix_user into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/322
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>
|
3 years ago |
|
娄文智
|
b7fea79aa9
|
按名称收索和查询
|
3 years ago |
|
zhangxin
|
4303dd5d2f
|
Merge pull request '同步数据添加字段' (#321) from fix_portalsync into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/321
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
|
娄文智
|
015efe9825
|
同步数据添加字段
|
3 years ago |
|
weichenglei
|
ff9dd9c163
|
Merge pull request '将cancelqty写入到供应商需求数据中' (#320) from fix_portal into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/320
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>
|
3 years ago |
|
zhangxin
|
35b23a0afb
|
将cancelqty写入到供应商需求数据中
|
3 years ago |
|
zhangxin
|
ce33efc903
|
添加cancelqty非空的限制
|
3 years ago |
|
zhangxin
|
dd7f7bc613
|
Merge pull request '添加了自动生成代码' (#319) from feature_NewCode into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/319
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
|
allanwei
|
b22b9f6f80
|
添加了自动生成代码
|
3 years ago |
|
allanwei
|
66a231ed46
|
添加了自动生成代码
|
3 years ago |
|
weichenglei
|
79d997f5e9
|
Merge pull request '修改portal显示的排序和添加portal的配置' (#318) from fix_portal into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/318
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>
|
3 years ago |
|
zhangxin
|
75791680c4
|
修改调度时间
|
3 years ago |
|
zhangxin
|
51d64c8ff5
|
修改排序字段
|
3 years ago |
