Merge remote-tracking branch 'origin/yem_rabbit_lhb' into yem_rabbit_lhb
# Conflicts: # settings.gradle
This commit is contained in:
commit
2756fc7bd7
@ -24,9 +24,6 @@ include(
|
||||
':yem-wm-bd',
|
||||
|
||||
':yem-wmzh-ii',
|
||||
':yem-wm-bd',
|
||||
':yem-wm-sex',
|
||||
|
||||
)
|
||||
|
||||
// -------------- 引入苍穹调试工程模块 --------------
|
||||
@ -52,7 +49,10 @@ project(':yem-wm-is').projectDir = new File('yem-wm/yem-wm-is')
|
||||
// -------------- 引入wm云-ct应用模块 --------------
|
||||
project(':yem-wm-ct').projectDir = new File('yem-wm/yem-wm-ct')
|
||||
|
||||
|
||||
project(':yem-wmzh-csm').projectDir = new File('yem-wmzh/yem-wmzh-csm')
|
||||
|
||||
// -------------- 引入wm云-bd应用模块 --------------
|
||||
project(':yem-wm-bd').projectDir = new File('yem-wm/yem-wm-bd')
|
||||
|
||||
// -------------- 引入wmzh云-ii应用模块 --------------
|
||||
project(':yem-wmzh-ii').projectDir = new File('yem-wmzh/yem-wmzh-ii')
|
||||
|
Loading…
Reference in New Issue
Block a user