fanli-server.git

返利

Merge remote-tracking branch 'origin/master'

yujian

2019-07-12 a8386e2acf689c8f5b77e290bcd027196e3e83fb

refs
用户	yujian <yujian@123.com>
	星期五, 七月 12, 2019 09:12 +0800
提交者	yujian <yujian@123.com>
	星期五, 七月 12, 2019 09:12 +0800
提交	a8386e2acf689c8f5b77e290bcd027196e3e83fb
目录	f5dc61df5f6b888f941ce6935eb5f8adcd16d3a0 目录 \| zip \| gz
parent	9d8dfb01ff72c57abad3b80f3d65e81a5354db03 查看 \| 对比 0b55c4944c9201d6e3205016b38840c058382459 查看 \| 对比

Merge remote-tracking branch 'origin/master'

Conflicts:
	fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/OrderRepairHistoryMapper.java
	fanli/src/main/java/com/yeshi/fanli/mapping/order/OrderRepairHistoryMapper.xml

2个文件已添加

	fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/OrderRepairHistoryMapper.java	9 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/java/com/yeshi/fanli/mapping/order/OrderRepairHistoryMapper.xml	74 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史