Merge branch 'master' into dev

wangzhengquan

2021-02-20 8bfe9f711612efde96a0d7b7aa3ba7178ab51640

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