Merge remote-tracking branch 'liujiankang/master'

# Conflicts:
#	watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/awaitingSignclosedProductInfoMapper.xml