xiugai ip

fhKeeper/formulahousekeeper/inva_4_tivo/index.html

@@ -424,10 +424,8 @@
                     <div class="whole">
                         <p class="total">基础版全部功能+</p>
                         <p><i><img src="../timesheet/src/assets/image/dui.png" alt=""></i>专业项目管理</p>
-                        <p><i><img src="../timesheet/src/assets/image/dui.png" alt=""></i>系统设置</p>
-                        <p><i><img src="../timesheet/src/assets/image/dui.png" alt=""></i>工时填报</p>
+                        <p><i><img src="../timesheet/src/assets/image/dui.png" alt=""></i>项目计划导入导出</p>
                         <p><i><img src="../timesheet/src/assets/image/dui.png" alt=""></i>任务和子任务管理</p>
-                        <p><i><img src="../timesheet/src/assets/image/dui.png" alt=""></i>工时审核</p>
                         <p><i><img src="../timesheet/src/assets/image/dui.png" alt=""></i>文件中心</p>
                         <p><i><img src="../timesheet/src/assets/image/dui.png" alt=""></i>按项目统计成本</p>
                         <p><i><img src="../timesheet/src/assets/image/dui.png" alt=""></i>项目数据统计</p>

fhKeeper/formulahousekeeper/timesheet/config/index.js

@@ -1,15 +1,9 @@
 var path = require('path')
 
 
-<<<<<<< HEAD
 //  var ip = '192.168.2.21'
  var ip = '47.100.37.243'
-=======
- //var ip = '192.168.2.21'
 
- var ip = '47.100.37.243'
-
->>>>>>> 61a8c174a9cdbcafd0f49f7ec68b9c9de601d8c1
 //  47.100.37.243
 // var os = require('os'), ip = '', ifaces = os.networkInterfaces() // 获取本机ip
 // for (var i in ifaces) {