zhangxin
|
870aa95baa
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_CHEERSSON_BACKEND into feature_mps
# Conflicts:
# dao/ap/implments/WeekModelLst.dao.impl.go
# dao/ap/implments/WorkCalendarLst.dao.impl.go
|
3 years ago |
DESKTOP-4672LME\Xu Tengfei
|
eab72f534b
|
调整mps 接口参数
|
3 years ago |
zhangxin
|
87b8732778
|
Merge pull request 'feature_mps_2' (#60) from feature_mps_2 into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_CHEERSSON_BACKEND/pulls/60
|
3 years ago |
DESKTOP-4672LME\Xu Tengfei
|
ce4368064a
|
Merge branch 'develop' of 101.201.121.115:leo/LAPP_CHEERSSON_BACKEND into feature_mps_2
|
3 years ago |
DESKTOP-4672LME\Xu Tengfei
|
376657e2e3
|
mps 客户物料查询接口
|
3 years ago |
zhangxin
|
d4973b6c15
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_CHEERSSON_BACKEND into feature_mps
# Conflicts:
# dao/ap/implments/WeekModelLst.dao.impl.go
# dao/ap/implments/WorkCalendarLst.dao.impl.go
|
3 years ago |
zhangxin
|
979b84b71f
|
修复字段硬编码的bug
|
3 years ago |
yehongyang
|
df5a635ca2
|
Merge pull request '修改原材料查询' (#59) from feature_bijiao into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_CHEERSSON_BACKEND/pulls/59
|
3 years ago |
娄文智
|
ccac757193
|
修改原材料查询
|
3 years ago |
娄文智
|
ff29cbdd9e
|
Merge pull request '修改 mps 接口 增加多条查询' (#58) from feature_mps_2 into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_CHEERSSON_BACKEND/pulls/58
|
3 years ago |
DESKTOP-4672LME\Xu Tengfei
|
8395e4d77b
|
修改 mps 接口 增加多条查询
|
3 years ago |
yehongyang
|
9c22278614
|
Merge pull request '客户文件导入功能开发' (#57) from feature_fileload into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_CHEERSSON_BACKEND/pulls/57
|
3 years ago |
娄文智
|
f2d7fd4309
|
客户文件导入功能开发
|
3 years ago |
yehongyang
|
7027fda308
|
Merge pull request '客户文件导入上传' (#56) from feature_fileload into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_CHEERSSON_BACKEND/pulls/56
|
3 years ago |
娄文智
|
5ef2d83d83
|
客户文件导入上传
|
3 years ago |
zhangxin
|
2509ad54a1
|
Merge pull request 'mps 时间模型bug修正' (#55) from feature_mps_2 into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_CHEERSSON_BACKEND/pulls/55
|
3 years ago |
DESKTOP-4672LME\Xu Tengfei
|
3a075ee201
|
mps 时间模型bug修正
|
3 years ago |
zhangxin
|
eb347cae6b
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_CHEERSSON_BACKEND into feature_mps
|
3 years ago |
zhangxin
|
f94b19bd6a
|
Merge pull request '修改mps bug' (#54) from feature_mps_2 into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_CHEERSSON_BACKEND/pulls/54
|
3 years ago |
DESKTOP-4672LME\Xu Tengfei
|
87729afa1f
|
修改mps bug
|
3 years ago |
zhangxin
|
d906f02e90
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_CHEERSSON_BACKEND into feature_mps
|
3 years ago |
zhangxin
|
4678d3b4a7
|
Merge pull request 'mps功能变更' (#53) from feature_mps_2 into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_CHEERSSON_BACKEND/pulls/53
|
3 years ago |
DESKTOP-4672LME\Xu Tengfei
|
e5e0efcc12
|
mps功能变更
|
3 years ago |
zhangxin
|
e46260f90e
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_CHEERSSON_BACKEND into feature_mps
|
3 years ago |
yehongyang
|
1f0208f855
|
Merge pull request '解决了乱序的问题' (#52) from fix_sort into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_CHEERSSON_BACKEND/pulls/52
|
3 years ago |
娄文智
|
00cf12d8ee
|
解决了乱序的问题
|
3 years ago |
zhangxin
|
4831675acc
|
Merge pull request 'MDS 修改' (#51) from feature_common into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_CHEERSSON_BACKEND/pulls/51
|
3 years ago |
娄文智
|
f3add4bccb
|
MDS 修改
|
3 years ago |
zhangxin
|
e46fe09d9f
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_CHEERSSON_BACKEND into feature_mps
|
3 years ago |
zhangxin
|
f62cc13e43
|
Merge pull request '共同model提交' (#50) from feature_common into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_CHEERSSON_BACKEND/pulls/50
|
3 years ago |
娄文智
|
73fdbeb6a4
|
共同model提交
|
3 years ago |
zhangxin
|
bd19e73ef2
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_CHEERSSON_BACKEND into feature_mps
# Conflicts:
# main.go
|
3 years ago |
zhangxin
|
94212599df
|
Merge pull request '原材料分析改进' (#49) from fix_fenxi into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_CHEERSSON_BACKEND/pulls/49
|
3 years ago |
娄文智
|
39c25c8255
|
原材料分析改进
|
3 years ago |
zhangxin
|
a84a7de71a
|
Merge pull request '正式发布模型' (#48) from fix_model into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_CHEERSSON_BACKEND/pulls/48
|
3 years ago |
zhangxin
|
745283c246
|
Merge branch 'develop' into fix_model
|
3 years ago |
娄文智
|
eca4550dd0
|
正式发布模型
|
3 years ago |
yehongyang
|
e314d55140
|
Merge pull request '修改键值的问题' (#47) from fix_model into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_CHEERSSON_BACKEND/pulls/47
|
3 years ago |
娄文智
|
7228629362
|
修改键值的问题
|
3 years ago |
yehongyang
|
15cdc3566e
|
Merge pull request 'token 状态码修改' (#46) from feature_token into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_CHEERSSON_BACKEND/pulls/46
|
3 years ago |
娄文智
|
c199490847
|
token 状态码修改
|
3 years ago |
zhangxin
|
c3bf14463a
|
Merge pull request '对于 bom添加缺少二级验证 导致死递归 修复' (#45) from feature_escalate into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_CHEERSSON_BACKEND/pulls/45
|
3 years ago |
yehongyang
|
8dca7417af
|
对于 bom添加缺少二级验证 导致死递归 修复
|
3 years ago |
zhangxin
|
8fc5bc0eda
|
Merge pull request '原材料查询' (#44) from feature_artcle into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_CHEERSSON_BACKEND/pulls/44
|
3 years ago |
娄文智
|
6f5bb2ea91
|
原材料分析
|
3 years ago |
娄文智
|
4f6a7ac12d
|
原材料查询
|
3 years ago |
娄文智
|
9bccd88a97
|
原材料分析
|
3 years ago |
zhangxin
|
e646936b80
|
Merge pull request '修改查询升级模型接口' (#43) from feature_escalate into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_CHEERSSON_BACKEND/pulls/43
|
3 years ago |
yehongyang
|
cbda36e162
|
修改查询升级模型接口
|
3 years ago |
zhangxin
|
78b049d59e
|
format code
|
3 years ago |