xiaozhiyong
							
						 | 
						
							
							
							
							
								
							
								81e136096d
								
							
								
							
						 | 
						
							
							
								
								更新
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								xiaozhiyong
							
						 | 
						
							
							
							
							
								
							
								da9e3c4ab4
								
							
								
							
						 | 
						
							
							
								
								更新
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								xiaozhiyong
							
						 | 
						
							
							
							
							
								
							
								3c902f183e
								
							
								
							
						 | 
						
							
							
								
								更新
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 zhangyouji
							
						 | 
						
							
							
							
							
								
							
								64ceaa9c19
								
							
								
							
						 | 
						
							
							
								
								Merge pull request '更新' (#9) from zyj into master
							
							
							
							
							
							
							
							Reviewed-on: #9 
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 zhangyouji
							
						 | 
						
							
							
							
							
								
							
								081e27e8b1
								
							
								
							
						 | 
						
							
							
								
								更新
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 zhangyouji
							
						 | 
						
							
							
							
							
								
							
								cca103aed3
								
							
								
							
						 | 
						
							
							
								
								Merge pull request '更新' (#8) from zyj into master
							
							
							
							
							
							
							
							Reviewed-on: #8 
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 zhangyouji
							
						 | 
						
							
							
							
							
								
							
								5ba90f1c45
								
							
								
							
						 | 
						
							
							
								
								更新
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								xiaozhiyong
							
						 | 
						
							
							
							
							
								
							
								571e8e5ee2
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of http://121.196.213.68:3000/caoliancun/wx_oms
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								xiaozhiyong
							
						 | 
						
							
							
							
							
								
							
								69f63076c8
								
							
								
							
						 | 
						
							
							
								
								更新
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 zhangyouji
							
						 | 
						
							
							
							
							
								
							
								39b6283793
								
							
								
							
						 | 
						
							
							
								
								Merge pull request 'zyj' (#7) from zyj into master
							
							
							
							
							
							
							
							Reviewed-on: #7 
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 zhangyouji
							
						 | 
						
							
							
							
							
								
							
								c5658fb2c7
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into zyj
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 zhangyouji
							
						 | 
						
							
							
							
							
								
							
								e6fbd6de48
								
							
								
							
						 | 
						
							
							
								
								在星链oms添加功能
							
							
							
							
							
							
							
							1.充值功能-对应运营管理系统中企业充值预处理功能
3.查询油价功能-对应运营管理系统中油价管理功能
4.公司管理-客户管理 开户维护银行信息功能 
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								xiaozhiyong
							
						 | 
						
							
							
							
							
								
							
								c872e87349
								
							
								
							
						 | 
						
							
							
								
								更新
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 zhangyouji
							
						 | 
						
							
							
							
							
								
							
								17416b9008
								
							
								
							
						 | 
						
							
							
								
								Merge pull request 'zyj' (#6) from zyj into master
							
							
							
							
							
							
							
							Reviewed-on: #6 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 zhangyouji
							
						 | 
						
							
							
							
							
								
							
								f43be96193
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into zyj
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 zhangyouji
							
						 | 
						
							
							
							
							
								
							
								8b12986800
								
							
								
							
						 | 
						
							
							
								
								调价任务-新增-添加策略组计算
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 zhangyouji
							
						 | 
						
							
							
							
							
								
							
								668ecb976f
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into zyj
							
							
							
							
							
							
							
							# Conflicts:
#	utils/request.js 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								xiaozhiyong
							
						 | 
						
							
							
							
							
								
							
								66d928e7d2
								
							
								
							
						 | 
						
							
							
								
								更新
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								xiaozhiyong
							
						 | 
						
							
							
							
							
								
							
								d6ba26cf31
								
							
								
							
						 | 
						
							
							
								
								更新
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 zhangyouji
							
						 | 
						
							
							
							
							
								
							
								f41a30578a
								
							
								
							
						 | 
						
							
							
								
								更新
							
							
							
							
							
						 | 
						
							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
							
						 | 
						
							
							
							
							
								
							
								9d829b3887
								
							
								
							
						 | 
						
							
							
								
								样式优化
							
							
							
							
							
						 | 
						
							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 |