xiaozhiyong
							
						 | 
						
							
							
							
							
								
							
								66d928e7d2
								
							
								
							
						 | 
						
							
							
								
								更新
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								xiaozhiyong
							
						 | 
						
							
							
							
							
								
							
								d6ba26cf31
								
							
								
							
						 | 
						
							
							
								
								更新
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								xiaozhiyong
							
						 | 
						
							
							
							
							
								
							
								895d23dd5c
								
							
								
							
						 | 
						
							
							
								
								更新
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								xiaozhiyong
							
						 | 
						
							
							
							
							
								
							
								eb174869a4
								
							
								
							
						 | 
						
							
							
								
								更新
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								xiaozhiyong
							
						 | 
						
							
							
							
							
								
							
								1410072142
								
							
								
							
						 | 
						
							
							
								
								更新
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								xiaozhiyong
							
						 | 
						
							
							
							
							
								
							
								b1726eba38
								
							
								
							
						 | 
						
							
							
								
								更新
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								xiaozhiyong
							
						 | 
						
							
							
							
							
								
							
								def9eac156
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into xiaozy_special
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								xiaozhiyong
							
						 | 
						
							
							
							
							
								
							
								51494be14f
								
							
								
							
						 | 
						
							
							
								
								更新
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 zhangyouji
							
						 | 
						
							
							
							
							
								
							
								c5ede2ad4c
								
							
								
							
						 | 
						
							
							
								
								Merge pull request '1、oms调拨时显示可调拨金额及哪些账户可进行调拨' (#5) from zyj into master
							
							
							
							
							
							
							
							Reviewed-on: #5 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 zhangyouji
							
						 | 
						
							
							
							
							
								
							
								7c2554cde1
								
							
								
							
						 | 
						
							
							
								
								1、oms调拨时显示可调拨金额及哪些账户可进行调拨
							
							
							
							
							
							
							
							2、oms可进行返利充值。
3、oms油站账户可查看近3日平均销量 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
									
								
								 肖志勇
							
						 | 
						
							
							
							
							
								
							
								f481362ca0
								
							
								
							
						 | 
						
							
							
								
								Merge pull request 'xiaozy_special' (#4) from xiaozy_special into master
							
							
							
							
							
							
							
							Reviewed-on: #4 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								xiaozhiyong
							
						 | 
						
							
							
							
							
								
							
								aabf040620
								
							
								
							
						 | 
						
							
							
								
								更新
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								xiaozhiyong
							
						 | 
						
							
							
							
							
								
							
								2fb5ef3efd
								
							
								
							
						 | 
						
							
							
								
								更新
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								xiaozhiyong
							
						 | 
						
							
							
							
							
								
							
								c2412056fd
								
							
								
							
						 | 
						
							
							
								
								更新
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								xiaozhiyong
							
						 | 
						
							
							
							
							
								
							
								8c006d4f8b
								
							
								
							
						 | 
						
							
							
								
								更新
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								xiaozhiyong
							
						 | 
						
							
							
							
							
								
							
								d4d20013f0
								
							
								
							
						 | 
						
							
							
								
								更新
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 zhangyouji
							
						 | 
						
							
							
							
							
								
							
								cb566136ed
								
							
								
							
						 | 
						
							
							
								
								Merge pull request 'zyj' (#3) from zyj into master
							
							
							
							
							
							
							
							Reviewed-on: #3 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 zhangyouji
							
						 | 
						
							
							
							
							
								
							
								f9716af72d
								
							
								
							
						 | 
						
							
							
								
								金额
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 zhangyouji
							
						 | 
						
							
							
							
							
								
							
								872c6f71d6
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into zyj
							
							
							
							
							
							
							
							# Conflicts:
#	api/sy.js
#	salesRanking/page/enterpriseDetails/enterpriseDetails.vue 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 zhangyouji
							
						 | 
						
							
							
							
							
								
							
								bf2ac62a0e
								
							
								
							
						 | 
						
							
							
								
								分油记录
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								xiaozhiyong
							
						 | 
						
							
							
							
							
								
							
								a09c18f0b5
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'xiaozy_当月动销'
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								xiaozhiyong
							
						 | 
						
							
							
							
							
								
							
								20899d6055
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of http://121.196.213.68:3000/caoliancun/wx_oms
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								xiaozhiyong
							
						 | 
						
							
							
							
							
								
							
								98c722a0f1
								
							
								
							
						 | 
						
							
							
								
								更新
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								xiaozhiyong
							
						 | 
						
							
							
							
							
								
							
								90bf153623
								
							
								
							
						 | 
						
							
							
								
								更新
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								xiaozhiyong
							
						 | 
						
							
							
							
							
								
							
								9bc6a6c855
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into xiaozy_当月动销
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 zhangyouji
							
						 | 
						
							
							
							
							
								
							
								2024e05db3
								
							
								
							
						 | 
						
							
							
								
								Merge pull request '首页图标' (#2) from zyj into master
							
							
							
							
							
							
							
							Reviewed-on: #2 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 zhangyouji
							
						 | 
						
							
							
							
							
								
							
								1c47c1cd47
								
							
								
							
						 | 
						
							
							
								
								首页图标
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								xiaozhiyong
							
						 | 
						
							
							
							
							
								
							
								c0cd0262f0
								
							
								
							
						 | 
						
							
							
								
								更新
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								xiaozhiyong
							
						 | 
						
							
							
							
							
								
							
								5ec7e9d36e
								
							
								
							
						 | 
						
							
							
								
								更新
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								xiaozhiyong
							
						 | 
						
							
							
							
							
								
							
								054f945b8a
								
							
								
							
						 | 
						
							
							
								
								更新
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								xiaozhiyong
							
						 | 
						
							
							
							
							
								
							
								3a618dcb68
								
							
								
							
						 | 
						
							
							
								
								更新
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								xiaozhiyong
							
						 | 
						
							
							
							
							
								
							
								096853f7d0
								
							
								
							
						 | 
						
							
							
								
								更新
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								xiaozhiyong
							
						 | 
						
							
							
							
							
								
							
								4a6d49610d
								
							
								
							
						 | 
						
							
							
								
								更新
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								xiaozhiyong
							
						 | 
						
							
							
							
							
								
							
								6b0e5e7399
								
							
								
							
						 | 
						
							
							
								
								更新
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								xiaozhiyong
							
						 | 
						
							
							
							
							
								
							
								81556f26a0
								
							
								
							
						 | 
						
							
							
								
								更新
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								xiaozhiyong
							
						 | 
						
							
							
							
							
								
							
								95d59596af
								
							
								
							
						 | 
						
							
							
								
								更新
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								xiaozhiyong
							
						 | 
						
							
							
							
							
								
							
								35befe4dde
								
							
								
							
						 | 
						
							
							
								
								更新
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								xiaozhiyong
							
						 | 
						
							
							
							
							
								
							
								9a4d3de6ed
								
							
								
							
						 | 
						
							
							
								
								更新
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								xiaozhiyong
							
						 | 
						
							
							
							
							
								
							
								de9a33d79c
								
							
								
							
						 | 
						
							
							
								
								更新
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								xiaozhiyong
							
						 | 
						
							
							
							
							
								
							
								4c55408455
								
							
								
							
						 | 
						
							
							
								
								更新
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								xiaozhiyong
							
						 | 
						
							
							
							
							
								
							
								a63dba10a2
								
							
								
							
						 | 
						
							
							
								
								更新
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								xiaozhiyong
							
						 | 
						
							
							
							
							
								
							
								e4ebf61ca3
								
							
								
							
						 | 
						
							
							
								
								更新
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								xiaozhiyong
							
						 | 
						
							
							
							
							
								
							
								5c36dd13b6
								
							
								
							
						 | 
						
							
							
								
								更新
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								xiaozhiyong
							
						 | 
						
							
							
							
							
								
							
								1d70f75633
								
							
								
							
						 | 
						
							
							
								
								更新
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								xiaozhiyong
							
						 | 
						
							
							
							
							
								
							
								9196734d72
								
							
								
							
						 | 
						
							
							
								
								更新
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								xiaozhiyong
							
						 | 
						
							
							
							
							
								
							
								a6909ed508
								
							
								
							
						 | 
						
							
							
								
								更新
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								xiaozhiyong
							
						 | 
						
							
							
							
							
								
							
								29ee331456
								
							
								
							
						 | 
						
							
							
								
								更新
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								xiaozhiyong
							
						 | 
						
							
							
							
							
								
							
								2774be4bb9
								
							
								
							
						 | 
						
							
							
								
								更新
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								xiaozhiyong
							
						 | 
						
							
							
							
							
								
							
								e8990961d4
								
							
								
							
						 | 
						
							
							
								
								更新
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								xiaozhiyong
							
						 | 
						
							
							
							
							
								
							
								facb5dc28e
								
							
								
							
						 | 
						
							
							
								
								更新
							
							
							
							
							
						 | 
						
							3 years ago |