Merge branch 'master' into dev

wangzhengquan

2021-01-18 fb3f4f606659af9cbf10b0b6710fb80fcaec5627

1
2
3
4
5
6
ipcrm -a
rm *.txt
./test_lostdata
sort -n c.txt  > c1.txt
sort -n p.txt  > p1.txt
diff -u p1.txt c1.txt