Commit Graph

118 Commits

Author SHA1 Message Date
罗干 26a86d2b1e Merge branch 'master' of http://192.168.0.27/dev0/PriceSystem 2018-04-24 17:27:36 +08:00
罗干 111da4aade 新文件: feature/__init__.py
新文件:   feature/region_feature.py
2018-04-24 17:23:22 +08:00
admin e3a1832f8b 移除matplotlib 2018-04-12 10:53:24 +08:00
admin b8ed0aa167 优化均价计算程序 2018-04-12 10:31:26 +08:00
admin b144cedbb4 修改日志级别 2018-04-12 09:59:22 +08:00
admin f34821c341 修改均价计算脚本 2018-04-11 16:40:20 +08:00
罗干 ad8a960049 修改: PriceSystem/fangjia/__init__.py
修改:     PriceSystem/fix/__pycache__/price_fix.cpython-36.pyc
	修改:     PriceSystem/fix/price_fix.py
	修改:     PriceSystem/test.py
2018-04-11 16:15:43 +08:00
罗干 3df2e72801 Merge branch 'master' of http://192.168.0.27/dev0/PriceSystem 2018-04-11 11:27:27 +08:00
罗干 a0619e6a20 修改: PriceSystem/sell_price/zhuge0118A.py
修改:     PriceSystem/test.py
2018-04-11 11:25:57 +08:00
admin d253c17cae 恢复均价计算命令发送脚本 2018-04-09 15:04:11 +08:00
admin c0dde47402 删除无用数据 2018-04-09 13:46:31 +08:00
admin 883dac4c83 解决冲突 2018-04-09 11:45:44 +08:00
admin 87ab9451bf Merge branch 'master' of 192.168.0.27:dev0/PriceSystem
# Conflicts:
#	PriceSystem/test.py
2018-04-09 11:43:51 +08:00
admin 7f8f48535c 优化 2018-04-09 11:42:46 +08:00
罗干 acec61b828 Merge branch 'master' of http://192.168.0.27/dev0/PriceSystem
修改:     PriceSystem/test.py
2018-04-09 11:20:47 +08:00
罗干 ba5a047035 新文件: PriceSystem/fix/__init__.py
新文件:   PriceSystem/fix/__pycache__/__init__.cpython-36.pyc
	新文件:   PriceSystem/fix/__pycache__/price_fix.cpython-36.pyc
	新文件:   PriceSystem/fix/price_fix.py
	修改:     PriceSystem/ones_Sender.py
	修改:     PriceSystem/sell_price/zhuge0118A.py
	修改:     PriceSystem/test.py
2018-04-09 11:16:53 +08:00
admin 9b39a072af 切换seawweed数据库 2018-04-08 13:03:53 +08:00
罗干 bf4de2667b 修改: PriceSystem/sell_price/zhuge0118A.py
修改:     PriceSystem/test.py
2018-04-08 10:38:14 +08:00
罗干 e8b20aeffe Merge branch 'master' of http://192.168.0.27/dev0/PriceSystem 2018-04-08 10:25:41 +08:00
罗干 bc6b42a5d4 修改: PriceSystem/sell_price/zhuge0118A.py 2018-04-08 10:25:02 +08:00
admin dd86da6e6b 切换DB 2018-04-08 09:49:36 +08:00
admin af075ca9df Merge branch 'master' of 192.168.0.27:dev0/PriceSystem
# Conflicts:
#	PriceSystem/test.py
2018-04-08 09:13:08 +08:00
admin 0bfa23dc19 fix bug 2018-04-08 09:12:27 +08:00
罗干 e1a67b9b42 修改: PriceSystem/fangjia/__init__.py
修改:     PriceSystem/sell_price/zhuge0118A.py
	修改:     PriceSystem/test.py
2018-04-04 15:03:01 +08:00
罗干 87d9681346 Merge branch 'master' of http://192.168.0.27/dev0/PriceSystem 2018-04-04 13:59:45 +08:00
罗干 d90f4109d0 修改: PriceSystem/sell_price/zhuge0118A.py 2018-04-04 13:59:17 +08:00
admin 1f9d64e130 恢复异常打印 2018-04-04 13:46:11 +08:00
admin 70b645a6c9 优化 2018-04-04 13:43:54 +08:00
admin 0067e12701 优化 2018-04-04 13:39:53 +08:00
admin e7253c1d50 Merge branch 'master' of 192.168.0.27:dev0/PriceSystem 2018-04-04 13:35:07 +08:00
admin 10c9b6de6f 优化异常捕获 2018-04-04 13:34:59 +08:00
罗干 0f0d03aa79 修改: PriceSystem/fangjia/__init__.py 2018-04-04 11:18:12 +08:00
罗干 5c47775ed3 修改: PriceSystem/fangjia/__init__.py
修改:     PriceSystem/sell_price/zhuge0118A.py
:	修改:     PriceSystem/test.py
2018-04-03 17:35:13 +08:00
admin e13910e00c Merge branch 'master' of 192.168.0.27:dev0/PriceSystem
# Conflicts:
#	PriceSystem/test.py
2018-04-02 16:09:28 +08:00
admin a3bbb47d2e 更新 2018-04-02 16:06:05 +08:00
罗干 9ab2ed087c Merge branch 'master' of http://192.168.0.27/dev0/PriceSystem
修改:     PriceSystem/CalcCmdReceiver.py
	修改:     PriceSystem/fangjia/__init__.py
2018-04-02 16:03:52 +08:00
罗干 6be19aefa2 修改: PriceSystem/fangjia/__init__.py
修改:     PriceSystem/sell_price/zhuge0118A.py
	修改:     PriceSystem/test.py
2018-04-02 16:03:07 +08:00
admin e4b1ed00df 解决冲突 2018-04-02 14:46:55 +08:00
admin be2f9f23a0 Merge branch 'master' of 192.168.0.27:dev0/PriceSystem 2018-04-02 14:43:26 +08:00
admin 77484c9271 修改计时方式 2018-04-02 14:43:13 +08:00
罗干 f9e0c8fde5 Merge branch 'master' of http://192.168.0.27/dev0/PriceSystem
修改:     PriceSystem/config/__init__.py
	修改:     PriceSystem/fangjia/__init__.py
	修改:     PriceSystem/sell_price/zhuge0118A.py
	修改:     PriceSystem/test.py
2018-04-02 14:35:13 +08:00
罗干 5c116d1e2b 修改: PriceSystem/fangjia/__init__.py
修改:     PriceSystem/sell_price/zhuge0118A.py
	修改:     PriceSystem/test.py
2018-04-02 14:33:43 +08:00
admin 09017dda8e 优化脚本 2018-04-02 14:21:34 +08:00
admin fe6f3b2922 修改数据库地址 2018-04-02 14:13:43 +08:00
admin 006bbc9064 切花DB 2018-04-02 14:03:18 +08:00
admin 032557c5a3 增加进程数 2018-04-02 11:23:19 +08:00
admin 0db1b7f077 优化代码 2018-04-02 10:38:39 +08:00
罗干 f4d1c80458 修改: PriceSystem/test.py 2018-03-30 11:27:24 +08:00
罗干 e976601925 修改: PriceSystem/sell_price/zhuge0118A.py
修改:     PriceSystem/test.py
2018-03-30 11:23:09 +08:00
罗干 d9b78e79ce 修改: PriceSystem/sell_price/zhuge0118A.py 2018-03-30 09:37:10 +08:00