 allanwei
|
61b26b6695
|
修正了元数据文件中的表名错误
|
3 years ago |
|
weichenglei
|
dcb4553e46
|
Merge pull request '修正了Meta错误' (#132) from fix_Meta into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/132
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
|
weichenglei
|
fda72d5ffe
|
Merge branch 'develop' into fix_Meta
|
3 years ago |
|
allanwei
|
30358ec7ca
|
修正了Meta错误
|
3 years ago |
|
weichenglei
|
c8c588faa2
|
Merge pull request '传值修改' (#131) from feature_artureedit into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/131
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>
|
3 years ago |
 娄文智
|
3e7e864d36
|
传值修改
|
3 years ago |
|
weichenglei
|
274480e8c7
|
Merge pull request '调整了OM_DemandHead的表名' (#130) from feature_OM_DemandGaasGFrameHead into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/130
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
|
allanwei
|
d8fac821ce
|
调整了OM_DemandHead的表名
|
3 years ago |
|
weichenglei
|
a3fecff5de
|
Merge pull request '添加了表OM_DemandHead的代码' (#129) from freature_OM_DemandHead into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/129
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
|
allanwei
|
b83c45c278
|
添加了表OM_DemandHead的代码
|
3 years ago |
|
weichenglei
|
8b818bb14b
|
Merge pull request '添加了OM模块下WorkOrder相关代码' (#128) from feature_OM_WordOrder into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/128
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
|
weichenglei
|
292236e5a7
|
Merge branch 'develop' into feature_OM_WordOrder
|
3 years ago |
|
allanwei
|
860b4ba279
|
添加了OM模块下WorkOrder相关代码
|
3 years ago |
|
weichenglei
|
8dc59d3413
|
Merge pull request '物料主数据维护' (#127) from feature_article into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/127
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>
|
3 years ago |
|
娄文智
|
894f7504f9
|
物料主数据维护
|
3 years ago |
|
weichenglei
|
789b2f0679
|
Merge pull request '修复weekmodelLst连表查询condition的bug' (#125) from fix_base into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/125
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>
|
3 years ago |
 zhangxin
|
63d9373fcd
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND into feature_base
|
3 years ago |
|
zhangxin
|
27266dd2e5
|
修复查询weekmodellst出现数据多的bug
|
3 years ago |
|
weichenglei
|
862f9d2a90
|
Merge pull request '修正了查询时的排序错误' (#124) from fix_DAO into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/124
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
|
allanwei
|
e7dabebad4
|
修正了查询时的排序错误
|
3 years ago |
|
weichenglei
|
220bcf924c
|
Merge pull request '修正了元数据文件定义错误' (#123) from fix_ArticleAtcodMeta into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/123
Reviewed-by: 娄文智 <wenzhi.lou@le-it.com.cn>
|
3 years ago |
|
allanwei
|
4ce458b028
|
修正了元数据文件定义错误
|
3 years ago |
|
weichenglei
|
bf9cd091fc
|
Merge pull request '更新weekModel和workCalendar时插入明细' (#122) from feature_base into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/122
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>
|
3 years ago |
|
zhangxin
|
f44e3e39b7
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND into feature_base
# Conflicts:
# dao/base/implments/WorkCalendarLst.dao.impl.go
|
3 years ago |
|
zhangxin
|
95420bfa4e
|
去掉测试代码
|
3 years ago |
|
weichenglei
|
a6fe4ec953
|
Merge pull request '刷新了DAO实现' (#121) from freature_NewDAO into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/121
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
|
allanwei
|
61fb71a50b
|
刷新了DAO实现
|
3 years ago |
|
zhangxin
|
b955ea717b
|
更新workCalendar和weekModel时同时更新明细
|
3 years ago |
|
zhangxin
|
2a37ac47e6
|
根据修改的colname修改连表时的condition
|
3 years ago |
|
weichenglei
|
970787a115
|
Merge pull request '补充了自动生成的代码' (#120) from freature_BaseCode into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/120
Reviewed-by: 娄文智 <wenzhi.lou@le-it.com.cn>
|
3 years ago |
|
weichenglei
|
27f520f98f
|
Merge branch 'develop' into freature_BaseCode
|
3 years ago |
|
allanwei
|
4e1082d9e8
|
补充了自动生成的代码
|
3 years ago |
|
weichenglei
|
37bc127490
|
Merge pull request '修复使用同一句柄的bug' (#119) from fix_log into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/119
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>
|
3 years ago |
|
zhangxin
|
c0c414aa8c
|
添加配置
|
3 years ago |
|
zhangxin
|
82edb3b320
|
修改不同配置使用一个collection句柄的bug
|
3 years ago |
|
zhangxin
|
ac8a04fbd9
|
修复文件句柄使用一个bug
|
3 years ago |
|
zhangxin
|
a6848e312d
|
修改日志分割为按天分割 添加配置注释
|
3 years ago |
|
weichenglei
|
bb212ba690
|
Merge pull request '调整了元数据文件' (#117) from fix_Meta into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/117
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
|
weichenglei
|
6d90f434ea
|
Merge branch 'develop' into fix_Meta
|
3 years ago |
|
zhangxin
|
068019d612
|
去掉多余的锁
|
3 years ago |
|
weichenglei
|
de1ce42887
|
Merge pull request '开发基础日志模块' (#118) from feature_log into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/118
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>
|
3 years ago |
|
weichenglei
|
deacd3a74a
|
Merge branch 'develop' into fix_Meta
|
3 years ago |
|
zhangxin
|
271afd2840
|
去掉测试代码
|
3 years ago |
|
zhangxin
|
8ded41b297
|
添加模板配置文件
|
3 years ago |
|
zhangxin
|
0bed096fc9
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND into feature_log
|
3 years ago |
|
zhangxin
|
7a2634b84a
|
添加日志模块功能并调试
|
3 years ago |
|
allanwei
|
a9b716da64
|
调整了元数据文件
|
3 years ago |
|
weichenglei
|
70572f1857
|
Merge pull request '插入workCalendar的同时插入workCalendarLst详情' (#116) from feature_base into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/116
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>
|
3 years ago |
|
zhangxin
|
b71777f235
|
插入workCalendar的同时插入workCalendarLst详情
|
3 years ago |
|
zhangxin
|
d2a62222f3
|
设置workCalendarNr为自增
|
3 years ago |
