leenksee1.1
/
linksee-backend-web


			
				
					
						
						
							123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104
							[33m67b575b[m[33m ([m[1;36mHEAD -> [m[1;32mmaster[m[33m, [m[1;31mlinkseestore/master[m[33m, [m[1;31mlinkseestore/dev[m[33m, [m[1;31mlinkseestore/67b575b[m[33m)[m HEAD@{0}: reset: moving to 67b575bdc9ed166d46f3b1a4221e91105bdc75e5
[33m67b575b[m[33m ([m[1;36mHEAD -> [m[1;32mmaster[m[33m, [m[1;31mlinkseestore/master[m[33m, [m[1;31mlinkseestore/dev[m[33m, [m[1;31mlinkseestore/67b575b[m[33m)[m HEAD@{1}: reset: moving to 67b575bdc9ed166d46f3b1a4221e91105bdc75e5
[33m86a3c1d[m HEAD@{2}: reset: moving to HEAD
[33m86a3c1d[m HEAD@{3}: commit: 备份一下
[33m67b575b[m[33m ([m[1;36mHEAD -> [m[1;32mmaster[m[33m, [m[1;31mlinkseestore/master[m[33m, [m[1;31mlinkseestore/dev[m[33m, [m[1;31mlinkseestore/67b575b[m[33m)[m HEAD@{4}: commit: 备份
[33m5b5ca53[m HEAD@{5}: commit: +耗材使用率
[33m88778bb[m[33m ([m[1;31morigin/dev[m[33m)[m HEAD@{6}: commit: 工单及相关 功能、样式调整
[33mab147c0[m HEAD@{7}: commit: 耗材+工单
[33mf5643a9[m HEAD@{8}: commit: 空品bug fix
[33m5209a52[m HEAD@{9}: commit: 插件盒子修改fix 存储
[33m05905c9[m HEAD@{10}: commit: 兼容旧插件备份
[33m9901e66[m HEAD@{11}: pull --tags linkseestore dev: Fast-forward
[33m6aa78fa[m HEAD@{12}: commit: merge
[33m359b925[m HEAD@{13}: commit: 空品 电表功能回归
[33m736c92a[m HEAD@{14}: commit: 2020/06/04 0:29 merge
[33m08cf5de[m HEAD@{15}: rebase finished: returning to refs/heads/master
[33m08cf5de[m HEAD@{16}: pull --rebase linkseestore dev: checkout 08cf5de49108c84109cbbca5fbd15609586f14ba
[33mae0bb41[m HEAD@{17}: commit: 空品 + 电表
[33m6ead005[m HEAD@{18}: commit (merge): Merge branch 'dev' of http://47.111.224.110:3000/pf/linksee-backend-web
[33m0c4e3e2[m HEAD@{19}: commit: before merge
[33m81dec35[m HEAD@{20}: commit: 新风机order fix
[33mf751ea7[m HEAD@{21}: commit: merge
[33m20211bb[m HEAD@{22}: pull --tags linkseestore dev: Fast-forward
[33mfa7c8ae[m HEAD@{23}: pull --tags linkseestore dev: Merge made by the 'recursive' strategy.
[33m49d4406[m HEAD@{24}: commit: before merge
[33m9a72ea1[m HEAD@{25}: commit: before merge
[33mf470a62[m HEAD@{26}: pull --tags linkseestore dev: Fast-forward
[33m1932be9[m HEAD@{27}: pull --tags linkseestore dev: Fast-forward
[33md9670a3[m HEAD@{28}: commit (merge): cy合并 可能有问题
[33m8b30ad5[m HEAD@{29}: commit: cy 2020/05/18 0:34 before merge
[33md425653[m HEAD@{30}: commit: cy 2020/5/17 19:29 before merge
[33mb8937b7[m HEAD@{31}: pull --tags linkseestore dev: Fast-forward
[33mac26e9f[m HEAD@{32}: pull --tags linkseestore dev: Merge made by the 'recursive' strategy.
[33mea8d296[m HEAD@{33}: commit: cy 2020/05/17 before commit
[33meafa3be[m HEAD@{34}: pull --tags linkseestore dev: Merge made by the 'recursive' strategy.
[33m6ad4864[m HEAD@{35}: commit: merge
[33m38b1a2e[m HEAD@{36}: pull --tags linkseestore dev: Fast-forward
[33m0616a44[m HEAD@{37}: pull --tags linkseestore dev: Merge made by the 'recursive' strategy.
[33m81eae32[m HEAD@{38}: commit: cy 2020/05/17 before merge
[33m8254e3e[m[33m ([m[1;31morigin/master[m[33m, [m[1;31morigin/HEAD[m[33m)[m HEAD@{39}: commit: 除可见不可见问题外的修改
[33m064e449[m HEAD@{40}: pull --tags linkseestore dev: Fast-forward
[33mdc570d7[m HEAD@{41}: pull --tags linkseestore dev: Merge made by the 'recursive' strategy.
[33mff382ef[m HEAD@{42}: commit: type bug fix
[33mc8b5cd1[m HEAD@{43}: commit: 部分问题修改 +
[33m7c9615c[m HEAD@{44}: pull --tags linkseestore dev: Merge made by the 'recursive' strategy.
[33m12bc79e[m HEAD@{45}: pull --tags linkseestore dev: Merge made by the 'recursive' strategy.
[33m0820390[m HEAD@{46}: commit: merge
[33ma4e90cf[m HEAD@{47}: pull --tags linkseestore dev: Fast-forward
[33m94b0494[m HEAD@{48}: pull --tags linkseestore dev: Merge made by the 'recursive' strategy.
[33m8338f3a[m HEAD@{49}: commit: 装置和standalone带上id
[33m81f8677[m HEAD@{50}: commit (merge): Merge branch 'dev' of http://47.111.224.110:3000/pf/linksee-backend-web
[33m307c9b5[m HEAD@{51}: commit: 同步按钮+装置type
[33m0059f9a[m HEAD@{52}: pull --tags linkseestore dev: Merge made by the 'recursive' strategy.
[33m069406d[m HEAD@{53}: commit: 2020-05-12
[33mc61652e[m HEAD@{54}: commit: 末端完成
[33m92acf03[m HEAD@{55}: commit: cy备份
[33m8355d1e[m HEAD@{56}: pull --tags linkseestore dev: Merge made by the 'recursive' strategy.
[33md2e49ac[m HEAD@{57}: pull --tags linkseestore dev: Merge made by the 'recursive' strategy.
[33m56ab563[m HEAD@{58}: pull --tags linkseestore dev: Merge made by the 'recursive' strategy.
[33m63f15e7[m HEAD@{59}: commit: edit完成合并
[33maf3ab32[m HEAD@{60}: pull --tags linkseestore dev: Fast-forward
[33mb518f84[m HEAD@{61}: pull --tags linkseestore dev: Fast-forward
[33m548ef1a[m HEAD@{62}: commit: 末端
[33m3dae613[m HEAD@{63}: commit: createbox 98%
[33m0fb28b6[m HEAD@{64}: commit: create-box 95%
[33mf23d1c4[m HEAD@{65}: commit: 整合
[33m43dd8a2[m HEAD@{66}: commit: 主机
[33m8a91399[m HEAD@{67}: commit: create完毕
[33m3365f5d[m HEAD@{68}: commit: edit 备份
[33mde35959[m HEAD@{69}: commit: edit 部分备份
[33ma021367[m HEAD@{70}: commit: JSON校对 备份
[33m52c2e94[m HEAD@{71}: commit: 末端
[33m07baac0[m HEAD@{72}: commit:  + 部分参数未确定 保存
[33m8813ab8[m HEAD@{73}: commit: 新风机插件高级设置完成 保存
[33m29dcb36[m HEAD@{74}: commit: 换热站基础设置完成
[33m589f82c[m HEAD@{75}: commit: 新风机基本完成
[33m41ed3d7[m HEAD@{76}: commit: 新风机部分存档
[33m9dcf2dd[m HEAD@{77}: commit: 修改命令出现双向绑定的问题
[33m739c959[m HEAD@{78}: commit: 插件option显示+筛选
[33md83cd5a[m HEAD@{79}: commit: 指征供水温度自定义装置完成 保存
[33m76ddd01[m HEAD@{80}: commit: 12
[33mb440217[m HEAD@{81}: commit: 盒子列表筛选+高级设置+项目未选择时隐藏+系统可用模式
[33m69c6b70[m HEAD@{82}: commit: 流程修改
[33m311be45[m HEAD@{83}: commit: 盒子管理：新增主机
[33m67bf90d[m HEAD@{84}: commit: mege
[33mbd1915c[m HEAD@{85}: commit: merge
[33m2a4ef0d[m HEAD@{86}: pull --tags LeenkSee dev: Fast-forward
[33m8e0ba22[m HEAD@{87}: commit: 盒子管理
[33m2c7c734[m HEAD@{88}: commit: 修改冗余代码+edit 赋值 对应问题修改
[33m30aca9e[m HEAD@{89}: pull LeenkSee dev: Merge made by the 'recursive' strategy.
[33m190828b[m HEAD@{90}: commit: mqtt联调
[33mf5be1ef[m HEAD@{91}: commit: 各种bug fixed
[33md07a0b8[m HEAD@{92}: commit (merge): merge
[33m9a01d7f[m HEAD@{93}: commit (merge): 1
[33m02764f7[m HEAD@{94}: commit: q
[33m0d2505c[m HEAD@{95}: commit: merge
[33m5eb36ab[m HEAD@{96}: commit (merge): Merge branch 'master' of https://github.com/q849830742/LeenkSee-Admin
[33m8705ee2[m HEAD@{97}: commit: 未同步上传
[33md36fd0c[m HEAD@{98}: pull --tags origin master: Fast-forward
[33m7f3bc2a[m HEAD@{99}: pull --tags origin master: Fast-forward
[33m3080c39[m HEAD@{100}: commit: merge
[33m4011c90[m HEAD@{101}: pull --tags origin master: Fast-forward
[33m1324538[m HEAD@{102}: commit: merge
[33m978639b[m HEAD@{103}: clone: from https://github.com/q849830742/LeenkSee-Admin.git