|  duanxiaoduan | d2a4105cdb
							
							Merge branch 'fearture/ci-test5' of duanxiaoduan/tmr-admin into develop | 2 жил өмнө | 
				
					
						|  duanxiaoduan | 1bdb1cc0c2
							
							更新 | 2 жил өмнө | 
				
					
						|  duanxiaoduan | e509c6ad96
							
							Merge branch 'feature/ci-test4' of duanxiaoduan/tmr-admin into develop | 2 жил өмнө | 
				
					
						|  duanxiaoduan | e458f48ac3
							
							8089 | 2 жил өмнө | 
				
					
						|  duanxiaoduan | 010c597e12
							
							Merge branch 'feature/ci-test3' of duanxiaoduan/tmr-admin into develop | 2 жил өмнө | 
				
					
						|  duanxiaoduan | c2ea2200eb
							
							8088 | 2 жил өмнө | 
				
					
						|  duanxiaoduan | b21eda733e
							
							Merge branch 'feature/ci-test2' of duanxiaoduan/tmr-admin into develop | 2 жил өмнө | 
				
					
						|  duanxiaoduan | 52c0359f0e
							
							更新 | 2 жил өмнө | 
				
					
						|  duanxiaoduan | e42d9a57ea
							
							Merge branch 'feature/ci-test2' of duanxiaoduan/tmr-admin into develop | 2 жил өмнө | 
				
					
						|  duanxiaoduan | 987579994e
							
							更新 | 2 жил өмнө | 
				
					
						|  duanxiaoduan | 7e1038de75
							
							Merge branch 'feature/ci-cd3' of duanxiaoduan/tmr-admin into develop | 2 жил өмнө | 
				
					
						|  duanxiaoduan | 4799de8d92
							
							默认参数sprinkle_feed_time_allow改为sprinkleFeedTimeAllow | 2 жил өмнө | 
				
					
						|  duanxiaoduan | b925f27d6b
							
							Merge branch 'feature/ci-cd2' of duanxiaoduan/tmr-admin into develop | 2 жил өмнө | 
				
					
						|  duanxiaoduan | e4afa465c9
							
							默认参数配置添加了集团端域名活IP字段 | 2 жил өмнө | 
				
					
						|  duanxiaoduan | 3b32d67183
							
							Merge branch 'feature/ci-cd' of duanxiaoduan/tmr-admin into develop | 2 жил өмнө | 
				
					
						|  duanxiaoduan | 6b2a7c46e9
							
							默认参数配置   新增允许撒料时间误差 | 2 жил өмнө | 
				
					
						|  duanxiaoduan | e2116e1cf0
							
							Merge branch 'feature/ci-cd' of duanxiaoduan/tmr-admin into develop | 2 жил өмнө | 
				
					
						|  duanxiaoduan | be961dff92
							
							1.饲料配方列表is_modify字段为1 不可以修改该配方 | 2 жил өмнө | 
				
					
						|  duanxiaoduan | 17374316e1
							
							1 | 2 жил өмнө | 
				
					
						|  duanxiaoduan | b08eb82bdc
							
							1 | 2 жил өмнө | 
				
					
						|  duanxiaoduan | c73ca00483
							
							Merge branch 'feature/ci-cd' of duanxiaoduan/tmr-admin into develop | 2 жил өмнө | 
				
					
						|  duanxiaoduan | cd66e42a26
							
							测试 | 2 жил өмнө | 
				
					
						|  duanxiaoduan | decfe2f2ff
							
							修改了username | 2 жил өмнө | 
				
					
						|  duanxiaoduan | 86d75cf5b9
							
							Merge branch 'feature/ci-cd' of duanxiaoduan/tmr-admin into develop | 2 жил өмнө | 
				
					
						|  duanxiaoduan | 23e2f0730f
							
							test | 2 жил өмнө | 
				
					
						|  duanxiaoduan | e7f49cdaf2
							
							Merge branch 'feature/ci-cd' of duanxiaoduan/tmr-admin into develop | 2 жил өмнө | 
				
					
						|  duanxiaoduan | a8977560cb
							
							Merge branch 'feature/ci-cd' of http://kpt.kptyun.cn:3000/duanxiaoduan/tmr-admin into feature/ci-cd | 2 жил өмнө | 
				
					
						|  duanxiaoduan | a8f8242b49
							
							md5 | 2 жил өмнө | 
				
					
						|  xuyiping | 4bdbd8a2e3
							
							Merge branch 'feature/ci-cd' of duanxiaoduan/tmr-admin into develop | 2 жил өмнө | 
				
					
						|  Yi | e0c966d431
							
							project: cicd 5 | 2 жил өмнө |