Commit 5cf8c5e9 authored by xiao-hesheng's avatar xiao-hesheng
Browse files

Merge remote-tracking branch 'remotes/origin/core_folw'

# Conflicts:
#	data/b5_spd3_core_business_flow/message10
#	data/b5_spd3_core_business_flow/message11
#	data/b5_spd3_core_business_flow/message12
#	data/b5_spd3_core_business_flow/message13
#	data/b5_spd3_core_business_flow/message14
#	data/b5_spd3_core_business_flow/message15
#	data/b5_spd3_core_business_flow/message8
#	data/b5_spd3_core_business_flow/message9
parent 56fb1457
...@@ -109,7 +109,7 @@ def main_text(): ...@@ -109,7 +109,7 @@ def main_text():
def flow11(): def flow11():
from execute import flow14 from execute import flow14
flow14() flow14()
print('流程11执行完毕','flow14执行完毕') print('流程11执行完毕','flow11执行完毕')
# sys.exit(0) # sys.exit(0)
def flow12(): def flow12():
from execute import flow15 from execute import flow15
......
...@@ -95,7 +95,7 @@ setInterval(updateTime, 1000); // 每秒更新一次时间 ...@@ -95,7 +95,7 @@ setInterval(updateTime, 1000); // 每秒更新一次时间
<tr width="600"> <tr width="600">
<td class="details-col-elapsed"><a href='../log/r_b8库房管理_库区设置_同步库房信息/log.html' target='_blank'>r_b8库房管理_库区设置_同步库房信息</a></td> <td class="details-col-elapsed"><a href='../log/r_b8库房管理_库区设置_同步库房信息/log.html' target='_blank'>r_b8库房管理_库区设置_同步库房信息</a></td>
<td class="success">成功</td> <td class="success">成功</td>
<td class="details-col-elapsed">8.637</td> <td class="details-col-elapsed">8.56</td>
<td class="details-col-elapsed">xiaohesheng</td> <td class="details-col-elapsed">xiaohesheng</td>
</tr> </tr>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment