Browse Source

Merge branch 'test2' into test

# Conflicts:
#	src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml
anderx 1 year ago
parent
commit
03ece560cd
1 changed files with 2123 additions and 2019 deletions
  1. 2123 2019
      src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

File diff suppressed because it is too large
+ 2123 - 2019
src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml