67b575b (HEAD -> master, linkseestore/master, linkseestore/dev, linkseestore/67b575b) HEAD@{0}: reset: moving to 67b575bdc9ed166d46f3b1a4221e91105bdc75e5 67b575b (HEAD -> master, linkseestore/master, linkseestore/dev, linkseestore/67b575b) HEAD@{1}: reset: moving to 67b575bdc9ed166d46f3b1a4221e91105bdc75e5 86a3c1d HEAD@{2}: reset: moving to HEAD 86a3c1d HEAD@{3}: commit: 备份一下 67b575b (HEAD -> master, linkseestore/master, linkseestore/dev, linkseestore/67b575b) HEAD@{4}: commit: 备份 5b5ca53 HEAD@{5}: commit: +耗材使用率 88778bb (origin/dev) HEAD@{6}: commit: 工单及相关 功能、样式调整 ab147c0 HEAD@{7}: commit: 耗材+工单 f5643a9 HEAD@{8}: commit: 空品bug fix 5209a52 HEAD@{9}: commit: 插件盒子修改fix 存储 05905c9 HEAD@{10}: commit: 兼容旧插件备份 9901e66 HEAD@{11}: pull --tags linkseestore dev: Fast-forward 6aa78fa HEAD@{12}: commit: merge 359b925 HEAD@{13}: commit: 空品 电表功能回归 736c92a HEAD@{14}: commit: 2020/06/04 0:29 merge 08cf5de HEAD@{15}: rebase finished: returning to refs/heads/master 08cf5de HEAD@{16}: pull --rebase linkseestore dev: checkout 08cf5de49108c84109cbbca5fbd15609586f14ba ae0bb41 HEAD@{17}: commit: 空品 + 电表 6ead005 HEAD@{18}: commit (merge): Merge branch 'dev' of http://47.111.224.110:3000/pf/linksee-backend-web 0c4e3e2 HEAD@{19}: commit: before merge 81dec35 HEAD@{20}: commit: 新风机order fix f751ea7 HEAD@{21}: commit: merge 20211bb HEAD@{22}: pull --tags linkseestore dev: Fast-forward fa7c8ae HEAD@{23}: pull --tags linkseestore dev: Merge made by the 'recursive' strategy. 49d4406 HEAD@{24}: commit: before merge 9a72ea1 HEAD@{25}: commit: before merge f470a62 HEAD@{26}: pull --tags linkseestore dev: Fast-forward 1932be9 HEAD@{27}: pull --tags linkseestore dev: Fast-forward d9670a3 HEAD@{28}: commit (merge): cy合并 可能有问题 8b30ad5 HEAD@{29}: commit: cy 2020/05/18 0:34 before merge d425653 HEAD@{30}: commit: cy 2020/5/17 19:29 before merge b8937b7 HEAD@{31}: pull --tags linkseestore dev: Fast-forward ac26e9f HEAD@{32}: pull --tags linkseestore dev: Merge made by the 'recursive' strategy. ea8d296 HEAD@{33}: commit: cy 2020/05/17 before commit eafa3be HEAD@{34}: pull --tags linkseestore dev: Merge made by the 'recursive' strategy. 6ad4864 HEAD@{35}: commit: merge 38b1a2e HEAD@{36}: pull --tags linkseestore dev: Fast-forward 0616a44 HEAD@{37}: pull --tags linkseestore dev: Merge made by the 'recursive' strategy. 81eae32 HEAD@{38}: commit: cy 2020/05/17 before merge 8254e3e (origin/master, origin/HEAD) HEAD@{39}: commit: 除可见不可见问题外的修改 064e449 HEAD@{40}: pull --tags linkseestore dev: Fast-forward dc570d7 HEAD@{41}: pull --tags linkseestore dev: Merge made by the 'recursive' strategy. ff382ef HEAD@{42}: commit: type bug fix c8b5cd1 HEAD@{43}: commit: 部分问题修改 + 7c9615c HEAD@{44}: pull --tags linkseestore dev: Merge made by the 'recursive' strategy. 12bc79e HEAD@{45}: pull --tags linkseestore dev: Merge made by the 'recursive' strategy. 0820390 HEAD@{46}: commit: merge a4e90cf HEAD@{47}: pull --tags linkseestore dev: Fast-forward 94b0494 HEAD@{48}: pull --tags linkseestore dev: Merge made by the 'recursive' strategy. 8338f3a HEAD@{49}: commit: 装置和standalone带上id 81f8677 HEAD@{50}: commit (merge): Merge branch 'dev' of http://47.111.224.110:3000/pf/linksee-backend-web 307c9b5 HEAD@{51}: commit: 同步按钮+装置type 0059f9a HEAD@{52}: pull --tags linkseestore dev: Merge made by the 'recursive' strategy. 069406d HEAD@{53}: commit: 2020-05-12 c61652e HEAD@{54}: commit: 末端完成 92acf03 HEAD@{55}: commit: cy备份 8355d1e HEAD@{56}: pull --tags linkseestore dev: Merge made by the 'recursive' strategy. d2e49ac HEAD@{57}: pull --tags linkseestore dev: Merge made by the 'recursive' strategy. 56ab563 HEAD@{58}: pull --tags linkseestore dev: Merge made by the 'recursive' strategy. 63f15e7 HEAD@{59}: commit: edit完成合并 af3ab32 HEAD@{60}: pull --tags linkseestore dev: Fast-forward b518f84 HEAD@{61}: pull --tags linkseestore dev: Fast-forward 548ef1a HEAD@{62}: commit: 末端 3dae613 HEAD@{63}: commit: createbox 98% 0fb28b6 HEAD@{64}: commit: create-box 95% f23d1c4 HEAD@{65}: commit: 整合 43dd8a2 HEAD@{66}: commit: 主机 8a91399 HEAD@{67}: commit: create完毕 3365f5d HEAD@{68}: commit: edit 备份 de35959 HEAD@{69}: commit: edit 部分备份 a021367 HEAD@{70}: commit: JSON校对 备份 52c2e94 HEAD@{71}: commit: 末端 07baac0 HEAD@{72}: commit: + 部分参数未确定 保存 8813ab8 HEAD@{73}: commit: 新风机插件高级设置完成 保存 29dcb36 HEAD@{74}: commit: 换热站基础设置完成 589f82c HEAD@{75}: commit: 新风机基本完成 41ed3d7 HEAD@{76}: commit: 新风机部分存档 9dcf2dd HEAD@{77}: commit: 修改命令出现双向绑定的问题 739c959 HEAD@{78}: commit: 插件option显示+筛选 d83cd5a HEAD@{79}: commit: 指征供水温度自定义装置完成 保存 76ddd01 HEAD@{80}: commit: 12 b440217 HEAD@{81}: commit: 盒子列表筛选+高级设置+项目未选择时隐藏+系统可用模式 69c6b70 HEAD@{82}: commit: 流程修改 311be45 HEAD@{83}: commit: 盒子管理:新增主机 67bf90d HEAD@{84}: commit: mege bd1915c HEAD@{85}: commit: merge 2a4ef0d HEAD@{86}: pull --tags LeenkSee dev: Fast-forward 8e0ba22 HEAD@{87}: commit: 盒子管理 2c7c734 HEAD@{88}: commit: 修改冗余代码+edit 赋值 对应问题修改 30aca9e HEAD@{89}: pull LeenkSee dev: Merge made by the 'recursive' strategy. 190828b HEAD@{90}: commit: mqtt联调 f5be1ef HEAD@{91}: commit: 各种bug fixed d07a0b8 HEAD@{92}: commit (merge): merge 9a01d7f HEAD@{93}: commit (merge): 1 02764f7 HEAD@{94}: commit: q 0d2505c HEAD@{95}: commit: merge 5eb36ab HEAD@{96}: commit (merge): Merge branch 'master' of https://github.com/q849830742/LeenkSee-Admin 8705ee2 HEAD@{97}: commit: 未同步上传 d36fd0c HEAD@{98}: pull --tags origin master: Fast-forward 7f3bc2a HEAD@{99}: pull --tags origin master: Fast-forward 3080c39 HEAD@{100}: commit: merge 4011c90 HEAD@{101}: pull --tags origin master: Fast-forward 1324538 HEAD@{102}: commit: merge 978639b HEAD@{103}: clone: from https://github.com/q849830742/LeenkSee-Admin.git