# Conflicts: # src/main/java/com/glxp/api/dao/thrsys/ThrInvOrderDetailMapper.java # src/main/java/com/glxp/api/dao/thrsys/ThrInvOrderMapper.java # src/main/java/com/glxp/api/service/thrsys/ThrInvOrderDetailService.java # src/main/java/com/glxp/api/service/thrsys/ThrInvOrderService.java # src/main/resources/mybatis/mapper/thrsys/ThrInvOrderDetailMapper.xml # src/main/resources/mybatis/mapper/thrsys/ThrInvOrderMapper.xml