yehongyang
|
f66e6e2b62
|
金蝶更新
|
3 years ago |
娄文智
|
a9c7efa0a5
|
Merge pull request '金蝶更新' (#120) from feature_jindie into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_CHEERSSON_BACKEND/pulls/120
|
3 years ago |
yehongyang
|
ca15199398
|
金蝶更新
|
3 years ago |
yehongyang
|
4c8da394dc
|
Merge pull request '自动创建版本信息' (#119) from feature_create into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_CHEERSSON_BACKEND/pulls/119
|
3 years ago |
娄文智
|
3c528b5d72
|
自动创建版本信息
|
3 years ago |
徐腾飞
|
003b753167
|
Merge pull request 'etl分包' (#118) from feature_jindie into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_CHEERSSON_BACKEND/pulls/118
|
3 years ago |
yehongyang
|
17063f1dd5
|
etl分包
|
3 years ago |
yehongyang
|
4386812d41
|
Merge pull request 'feature_mps_2 修改 mps erp' (#117) from feature_mps_2 into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_CHEERSSON_BACKEND/pulls/117
|
3 years ago |
DESKTOP-4672LME\Xu Tengfei
|
8431d19db4
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_CHEERSSON_BACKEND into feature_mps_2
# Conflicts:
# services/ap/implments/CustArtlst.service.impl.go
|
3 years ago |
徐腾飞
|
b037816fe9
|
Merge pull request '金蝶更新' (#116) from feature_jindie into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_CHEERSSON_BACKEND/pulls/116
|
3 years ago |
DESKTOP-4672LME\Xu Tengfei
|
9ad1d46b05
|
erp mps 功能修改
|
3 years ago |
yehongyang
|
7edced8497
|
金蝶更新
|
3 years ago |
徐腾飞
|
e25e3728f0
|
Merge pull request '没有关联客户模型,报错' (#115) from fix_model into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_CHEERSSON_BACKEND/pulls/115
|
3 years ago |
娄文智
|
aad3859742
|
没有关联客户模型,报错
|
3 years ago |
徐腾飞
|
350cbbee70
|
Merge pull request '模糊查询' (#114) from fix_search into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_CHEERSSON_BACKEND/pulls/114
|
3 years ago |
娄文智
|
fad4cd512a
|
模糊查询
|
3 years ago |
徐腾飞
|
20d5dabb94
|
Merge pull request '模糊搜索查询' (#113) from fix_search into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_CHEERSSON_BACKEND/pulls/113
|
3 years ago |
娄文智
|
1a8c923928
|
模糊搜索查询
|
3 years ago |
娄文智
|
9bb1fc74b5
|
Merge pull request 'feature_jindie' (#112) from feature_jindie into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_CHEERSSON_BACKEND/pulls/112
|
3 years ago |
yehongyang
|
bb1c22fe47
|
发布更新
|
3 years ago |
yehongyang
|
eb05596dca
|
Merge branch 'develop' into feature_jindie
|
3 years ago |
yehongyang
|
1a92e56e63
|
Merge pull request '新增零件' (#111) from fix_materials into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_CHEERSSON_BACKEND/pulls/111
|
3 years ago |
娄文智
|
a9715763a0
|
新增零件
|
3 years ago |
yehongyang
|
3075d6ebd3
|
金蝶发布记录预测id
|
3 years ago |
yehongyang
|
97ece1fdbd
|
Merge pull request '以原材料查询' (#110) from fix_materials into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_CHEERSSON_BACKEND/pulls/110
|
3 years ago |
娄文智
|
7a8b071f70
|
以原材料查询
|
3 years ago |
zhangxin
|
cc6ccd2d6e
|
Merge pull request '导入' (#109) from fix_import5 into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_CHEERSSON_BACKEND/pulls/109
|
3 years ago |
娄文智
|
a573ad668b
|
导入
|
3 years ago |
娄文智
|
cc54e33435
|
Merge pull request '添加查询一条时对artId的赋值' (#108) from feature_mps into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_CHEERSSON_BACKEND/pulls/108
|
3 years ago |
zhangxin
|
285bfbff02
|
添加查询一条时对artId的赋值
|
3 years ago |
yehongyang
|
5ca4c12901
|
Merge pull request '更新全局发布功能' (#107) from feature_global into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_CHEERSSON_BACKEND/pulls/107
|
3 years ago |
娄文智
|
115da132c1
|
更新全局发布功能
|
3 years ago |
徐腾飞
|
65b2fbd8c3
|
Merge pull request '时间模型支持跨天' (#106) from feature_mps into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_CHEERSSON_BACKEND/pulls/106
|
3 years ago |
zhangxin
|
d342496243
|
注释掉无用代码
|
3 years ago |
zhangxin
|
473a3f9e2f
|
删除主键
|
3 years ago |
zhangxin
|
7fd8d0daff
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_CHEERSSON_BACKEND into feature_mps
|
3 years ago |
yehongyang
|
8a8e4fa130
|
Merge pull request '自动创建版本' (#105) from feature_global into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_CHEERSSON_BACKEND/pulls/105
|
3 years ago |
娄文智
|
265b442fe5
|
自动创建版本
|
3 years ago |
zhangxin
|
a801253395
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_CHEERSSON_BACKEND into feature_mps
|
3 years ago |
娄文智
|
a0cad41ca6
|
Merge pull request '修复bug' (#104) from feature_jindie into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_CHEERSSON_BACKEND/pulls/104
|
3 years ago |
yehongyang
|
1c62c1a81f
|
修复bug
|
3 years ago |
zhangxin
|
72167745d5
|
恢复注释掉的代码
|
3 years ago |
zhangxin
|
bd7626648c
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_CHEERSSON_BACKEND into feature_mps
|
3 years ago |
zhangxin
|
2b415c8d5d
|
时间模型支持跨天
|
3 years ago |
徐腾飞
|
0c4aa38191
|
Merge pull request '需求更新' (#102) from feature_jindie into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_CHEERSSON_BACKEND/pulls/102
|
3 years ago |
yehongyang
|
d348350c91
|
需求更新
|
3 years ago |
yehongyang
|
5de8608452
|
Merge pull request 'feature_mps_2 erp bug 修改' (#101) from feature_mps_2 into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_CHEERSSON_BACKEND/pulls/101
|
3 years ago |
DESKTOP-4672LME\Xu Tengfei
|
1334a26277
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_CHEERSSON_BACKEND into feature_mps_2
# Conflicts:
# models/ap/ap.go
# web/controllers/ap/ap.go
|
3 years ago |
yehongyang
|
6aabad6ed6
|
Merge pull request '添加物料库存和资源关联关系维护的功能代码' (#100) from feature_mps into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_CHEERSSON_BACKEND/pulls/100
|
3 years ago |
DESKTOP-4672LME\Xu Tengfei
|
654f0207b5
|
erp bug 修改
|
3 years ago |