冲突暂存

.tea/configuration/mini-program.json

-<<<<<<< HEAD
-{"tinyType":"dingtalk","tinyCnName":"钉钉","tinyProjectType":"dingtalk-biz-isv","dingtalk:dingtalk-biz-isv:tinyIcon":"https://gw.alipayobjects.com/zos/rmsportal/mAzWuEDGpTlpugsPXgzf.svg","dingtalk:dingtalk-biz-isv:compilePreviewTime":"2020-02-05 11:55:36","dingtalk:dingtalk-biz-isv:compilePreviewWholePackSize":"18.9 KB","dingtalk:dingtalk-biz-isv:compilePreviewSubpackSizes":"","dingtalk:dingtalk-biz-isv:_appIdList":[{"orgName":"叶琴的体验团队","corpId":"ding1fc0618931c5be0a35c2f4657eb6378f","orgId":30571993,"apps":[{"miniAppName":"企业e卡通","bizType":1,"miniAppId":"2019082266405446","icon":"https://static.dingtalk.com/media/lALPDeC2uVA51FrMyMzI_200_200.png"}]},{"orgName":"爸爸的测试企业","corpId":"dingeb04d7fcad9041a435c2f4657eb6378f","orgId":94926075,"apps":[{"miniAppName":"明我会议室","bizType":1,"miniAppId":"2021000196656527","icon":"https://static.dingtalk.com/media/lADPDeC2usmAs3LMyMzI_200_200.jpg"}]},{"orgName":"明我mingwork","corpId":"dingc105456f10a5234f","orgLogo":"@lALPBY0V41nzq_PNAoDNAoA","orgId":5118349,"apps":[]},{"orgName":"亢建荣测试","corpId":"ding9a93ca550f036ffe35c2f4657eb6378f","orgId":39441482,"apps":[{"miniAppName":"明我盒子测试版","bizType":1,"miniAppId":"2018070960528738","icon":"https://static.dingtalk.com/media/lALPBY0V45ZQ69DNAeTNAoI_642_484.png"},{"miniAppName":"mingpay","bizType":1,"miniAppId":"2019051664880184","icon":"https://static.dingtalk.com/media/lALPDeC2uFBmiNDMkMyQ_144_144.png"},{"miniAppName":"企业e卡通测试","bizType":1,"miniAppId":"2019080766135403","icon":"https://static.dingtalk.com/media/lALPDeC2ulRyREDMyMzI_200_200.png"},{"miniAppName":"明我会议室","bizType":1,"miniAppId":"2021001100624233","icon":"https://static.dingtalk.com/media/lALPDeC2uv2EoenMkMyQ_144_144.png"}]}],"dingtalk:dingtalk-biz-isv:preAuditLimit":5,"dingtalk:dingtalk-biz-isv:preAuditUsed":0,"dingtalk:dingtalk-biz-isv:uploadTime":"","dingtalk:dingtalk-biz-isv:packageSize":"","dingtalk:dingtalk-biz-isv:auditLink":null,"dingtalk:dingtalk-biz-isv:whiteListLink":null,"dingtalk:dingtalk-biz-isv:_enableAutoPush":false,"dingtalk:dingtalk-biz-isv:_appId":"2019080766135403","dingtalk:dingtalk-biz-isv:_appName":"企业e卡通测试","dingtalk:dingtalk-biz-isv:_orgId":39441482,"dingtalk:dingtalk-biz-isv:_corpId":"ding9a93ca550f036ffe35c2f4657eb6378f","dingtalk:dingtalk-biz-isv:remoteVersion":"0.0.23","dingtalk:dingtalk-biz-isv:currentVersion":"0.0.24","dingtalk:dingtalk-biz-isv:whiteList":["60.191.0.172","gateway-beta.mingwork.com","restapi.amap.com","mingpos.mingwork.com","139.196.213.18","60.191.0.166","192.168.1.101"],"dingtalk:dingtalk-biz-isv:h5WhiteList":[],"dingtalk:dingtalk-biz-isv:experCorpId":"dingb625cb941fe828d935c2f4657eb6378f","dingtalk:dingtalk-biz-isv:experCorpName":"亢建荣体验馆","dingtalk:dingtalk-biz:tinyIcon":"https://gw.alipayobjects.com/zos/rmsportal/mAzWuEDGpTlpugsPXgzf.svg","dingtalk:dingtalk-biz:compilePreviewTime":"2020-02-07 12:54:57","dingtalk:dingtalk-biz:compilePreviewWholePackSize":"42.5 KB","dingtalk:dingtalk-biz:compilePreviewSubpackSizes":"","dingtalk:dingtalk-biz:_appIdList":[{"orgName":"亢建荣测试","corpId":"ding9a93ca550f036ffe35c2f4657eb6378f","orgId":39441482,"apps":[{"miniAppName":"mingpay2","bizType":2,"miniAppId":"2019061465615005","icon":"https://static.dingtalk.com/media/lADPDeC2uJiDYQDNAZvNApI_658_411.jpg"}]}],"dingtalk:dingtalk-biz:preAuditLimit":5,"dingtalk:dingtalk-biz:preAuditUsed":0,"dingtalk:dingtalk-biz:uploadTime":"","dingtalk:dingtalk-biz:packageSize":"","dingtalk:dingtalk-biz:auditLink":null,"dingtalk:dingtalk-biz:whiteListLink":null,"dingtalk:dingtalk-biz:_enableAutoPush":false,"dingtalk:dingtalk-biz:_appId":"2019061465615005","dingtalk:dingtalk-biz:_appName":"mingpay2","dingtalk:dingtalk-biz:_orgId":"39441482","dingtalk:dingtalk-biz:_corpId":"ding9a93ca550f036ffe35c2f4657eb6378f","dingtalk:dingtalk-biz:remoteVersion":"0.0.33","dingtalk:dingtalk-biz:currentVersion":"0.0.34","dingtalk:dingtalk-biz:whiteList":["139.196.213.18"],"dingtalk:dingtalk-biz:h5WhiteList":[],"isSimulatorOpen":true,"isNotFirstToggleSimulator":true,"dingtalk:dingtalk-biz:lastZoom":125,"SimulatorMode":"WINDOW","storageVersion":"1.5.5"}
+{"tinyType":"dingtalk","tinyCnName":"钉钉","tinyProjectType":"dingtalk-biz","dingtalk:dingtalk-biz-isv:tinyIcon":"https://gw.alipayobjects.com/zos/rmsportal/mAzWuEDGpTlpugsPXgzf.svg","dingtalk:dingtalk-biz-isv:compilePreviewTime":"2020-02-05 11:55:36","dingtalk:dingtalk-biz-isv:compilePreviewWholePackSize":"18.9 KB","dingtalk:dingtalk-biz-isv:compilePreviewSubpackSizes":"","dingtalk:dingtalk-biz-isv:_appIdList":[{"orgName":"叶琴的体验团队","corpId":"ding1fc0618931c5be0a35c2f4657eb6378f","orgId":30571993,"apps":[{"miniAppName":"企业e卡通","bizType":1,"miniAppId":"2019082266405446","icon":"https://static.dingtalk.com/media/lALPDeC2uVA51FrMyMzI_200_200.png"}]},{"orgName":"爸爸的测试企业","corpId":"dingeb04d7fcad9041a435c2f4657eb6378f","orgId":94926075,"apps":[{"miniAppName":"明我会议室","bizType":1,"miniAppId":"2021000196656527","icon":"https://static.dingtalk.com/media/lADPDeC2usmAs3LMyMzI_200_200.jpg"}]},{"orgName":"明我mingwork","corpId":"dingc105456f10a5234f","orgLogo":"@lALPBY0V41nzq_PNAoDNAoA","orgId":5118349,"apps":[]},{"orgName":"亢建荣测试","corpId":"ding9a93ca550f036ffe35c2f4657eb6378f","orgId":39441482,"apps":[{"miniAppName":"mingpay","bizType":1,"miniAppId":"2019051664880184","icon":"https://static.dingtalk.com/media/lALPDeC2uFBmiNDMkMyQ_144_144.png"},{"miniAppName":"企业e卡通测试","bizType":1,"miniAppId":"2019080766135403","icon":"https://static.dingtalk.com/media/lALPDeC2ulRyREDMyMzI_200_200.png"},{"miniAppName":"明我会议室","bizType":1,"miniAppId":"2021001100624233","icon":"https://static.dingtalk.com/media/lALPDeC2uv2EoenMkMyQ_144_144.png"}]}],"dingtalk:dingtalk-biz-isv:preAuditLimit":5,"dingtalk:dingtalk-biz-isv:preAuditUsed":0,"dingtalk:dingtalk-biz-isv:uploadTime":"","dingtalk:dingtalk-biz-isv:packageSize":"","dingtalk:dingtalk-biz-isv:auditLink":null,"dingtalk:dingtalk-biz-isv:whiteListLink":null,"dingtalk:dingtalk-biz-isv:_enableAutoPush":false,"dingtalk:dingtalk-biz-isv:_appId":"2019080766135403","dingtalk:dingtalk-biz-isv:_appName":"企业e卡通测试","dingtalk:dingtalk-biz-isv:_orgId":39441482,"dingtalk:dingtalk-biz-isv:_corpId":"ding9a93ca550f036ffe35c2f4657eb6378f","dingtalk:dingtalk-biz-isv:remoteVersion":"0.0.23","dingtalk:dingtalk-biz-isv:currentVersion":"0.0.24","dingtalk:dingtalk-biz-isv:whiteList":["60.191.0.172","gateway-beta.mingwork.com","restapi.amap.com","mingpos.mingwork.com","139.196.213.18","60.191.0.166","192.168.1.101"],"dingtalk:dingtalk-biz-isv:h5WhiteList":[],"dingtalk:dingtalk-biz-isv:experCorpId":"dingb625cb941fe828d935c2f4657eb6378f","dingtalk:dingtalk-biz-isv:experCorpName":"亢建荣体验馆","dingtalk:dingtalk-biz:tinyIcon":"https://gw.alipayobjects.com/zos/rmsportal/mAzWuEDGpTlpugsPXgzf.svg","dingtalk:dingtalk-biz:compilePreviewTime":"2020-02-11 11:05:29","dingtalk:dingtalk-biz:compilePreviewWholePackSize":"50.5 KB","dingtalk:dingtalk-biz:compilePreviewSubpackSizes":"","dingtalk:dingtalk-biz:_appIdList":[{"orgName":"亢建荣测试","corpId":"ding9a93ca550f036ffe35c2f4657eb6378f","orgId":39441482,"apps":[{"miniAppName":"mingpay2","bizType":2,"miniAppId":"2019061465615005","icon":"https://static.dingtalk.com/media/lADPDeC2uJiDYQDNAZvNApI_658_411.jpg"}]}],"dingtalk:dingtalk-biz:preAuditLimit":5,"dingtalk:dingtalk-biz:preAuditUsed":0,"dingtalk:dingtalk-biz:uploadTime":"","dingtalk:dingtalk-biz:packageSize":"","dingtalk:dingtalk-biz:auditLink":null,"dingtalk:dingtalk-biz:whiteListLink":null,"dingtalk:dingtalk-biz:_enableAutoPush":false,"dingtalk:dingtalk-biz:_appId":"2019061465615005","dingtalk:dingtalk-biz:_appName":"mingpay2","dingtalk:dingtalk-biz:_orgId":"39441482","dingtalk:dingtalk-biz:_corpId":"ding9a93ca550f036ffe35c2f4657eb6378f","dingtalk:dingtalk-biz:remoteVersion":"0.0.33","dingtalk:dingtalk-biz:currentVersion":"0.0.34","dingtalk:dingtalk-biz:whiteList":["139.196.213.18"],"dingtalk:dingtalk-biz:h5WhiteList":[],"isSimulatorOpen":true,"isNotFirstToggleSimulator":true,"dingtalk:dingtalk-biz:lastZoom":100,"storageVersion":"1.5.7"}
\ No newline at end of file
-=======
-{"tinyType":"dingtalk","tinyCnName":"钉钉","tinyProjectType":"dingtalk-biz","dingtalk:dingtalk-biz-isv:tinyIcon":"https://gw.alipayobjects.com/zos/rmsportal/mAzWuEDGpTlpugsPXgzf.svg","dingtalk:dingtalk-biz-isv:compilePreviewTime":"2020-02-05 11:55:36","dingtalk:dingtalk-biz-isv:compilePreviewWholePackSize":"18.9 KB","dingtalk:dingtalk-biz-isv:compilePreviewSubpackSizes":"","dingtalk:dingtalk-biz-isv:_appIdList":[{"orgName":"叶琴的体验团队","corpId":"ding1fc0618931c5be0a35c2f4657eb6378f","orgId":30571993,"apps":[{"miniAppName":"企业e卡通","bizType":1,"miniAppId":"2019082266405446","icon":"https://static.dingtalk.com/media/lALPDeC2uVA51FrMyMzI_200_200.png"}]},{"orgName":"爸爸的测试企业","corpId":"dingeb04d7fcad9041a435c2f4657eb6378f","orgId":94926075,"apps":[{"miniAppName":"明我会议室","bizType":1,"miniAppId":"2021000196656527","icon":"https://static.dingtalk.com/media/lADPDeC2usmAs3LMyMzI_200_200.jpg"}]},{"orgName":"明我mingwork","corpId":"dingc105456f10a5234f","orgLogo":"@lALPBY0V41nzq_PNAoDNAoA","orgId":5118349,"apps":[]},{"orgName":"亢建荣测试","corpId":"ding9a93ca550f036ffe35c2f4657eb6378f","orgId":39441482,"apps":[{"miniAppName":"mingpay","bizType":1,"miniAppId":"2019051664880184","icon":"https://static.dingtalk.com/media/lALPDeC2uFBmiNDMkMyQ_144_144.png"},{"miniAppName":"企业e卡通测试","bizType":1,"miniAppId":"2019080766135403","icon":"https://static.dingtalk.com/media/lALPDeC2ulRyREDMyMzI_200_200.png"},{"miniAppName":"明我会议室","bizType":1,"miniAppId":"2021001100624233","icon":"https://static.dingtalk.com/media/lALPDeC2uv2EoenMkMyQ_144_144.png"}]}],"dingtalk:dingtalk-biz-isv:preAuditLimit":5,"dingtalk:dingtalk-biz-isv:preAuditUsed":0,"dingtalk:dingtalk-biz-isv:uploadTime":"","dingtalk:dingtalk-biz-isv:packageSize":"","dingtalk:dingtalk-biz-isv:auditLink":null,"dingtalk:dingtalk-biz-isv:whiteListLink":null,"dingtalk:dingtalk-biz-isv:_enableAutoPush":false,"dingtalk:dingtalk-biz-isv:_appId":"2019080766135403","dingtalk:dingtalk-biz-isv:_appName":"企业e卡通测试","dingtalk:dingtalk-biz-isv:_orgId":39441482,"dingtalk:dingtalk-biz-isv:_corpId":"ding9a93ca550f036ffe35c2f4657eb6378f","dingtalk:dingtalk-biz-isv:remoteVersion":"0.0.23","dingtalk:dingtalk-biz-isv:currentVersion":"0.0.24","dingtalk:dingtalk-biz-isv:whiteList":["60.191.0.172","gateway-beta.mingwork.com","restapi.amap.com","mingpos.mingwork.com","139.196.213.18","60.191.0.166","192.168.1.101"],"dingtalk:dingtalk-biz-isv:h5WhiteList":[],"dingtalk:dingtalk-biz-isv:experCorpId":"dingb625cb941fe828d935c2f4657eb6378f","dingtalk:dingtalk-biz-isv:experCorpName":"亢建荣体验馆","dingtalk:dingtalk-biz:tinyIcon":"https://gw.alipayobjects.com/zos/rmsportal/mAzWuEDGpTlpugsPXgzf.svg","dingtalk:dingtalk-biz:compilePreviewTime":"2020-02-10 16:56:10","dingtalk:dingtalk-biz:compilePreviewWholePackSize":"48.3 KB","dingtalk:dingtalk-biz:compilePreviewSubpackSizes":"","dingtalk:dingtalk-biz:_appIdList":[{"orgName":"亢建荣测试","corpId":"ding9a93ca550f036ffe35c2f4657eb6378f","orgId":39441482,"apps":[{"miniAppName":"mingpay2","bizType":2,"miniAppId":"2019061465615005","icon":"https://static.dingtalk.com/media/lADPDeC2uJiDYQDNAZvNApI_658_411.jpg"}]}],"dingtalk:dingtalk-biz:preAuditLimit":5,"dingtalk:dingtalk-biz:preAuditUsed":0,"dingtalk:dingtalk-biz:uploadTime":"","dingtalk:dingtalk-biz:packageSize":"","dingtalk:dingtalk-biz:auditLink":null,"dingtalk:dingtalk-biz:whiteListLink":null,"dingtalk:dingtalk-biz:_enableAutoPush":false,"dingtalk:dingtalk-biz:_appId":"2019061465615005","dingtalk:dingtalk-biz:_appName":"mingpay2","dingtalk:dingtalk-biz:_orgId":"39441482","dingtalk:dingtalk-biz:_corpId":"ding9a93ca550f036ffe35c2f4657eb6378f","dingtalk:dingtalk-biz:remoteVersion":"0.0.33","dingtalk:dingtalk-biz:currentVersion":"0.0.34","dingtalk:dingtalk-biz:whiteList":["139.196.213.18"],"dingtalk:dingtalk-biz:h5WhiteList":[],"isSimulatorOpen":true,"isNotFirstToggleSimulator":true,"dingtalk:dingtalk-biz:lastZoom":100,"storageVersion":"1.5.7"}
->>>>>>> 907505a0e30e08ac629232f61c09769fd862ca08

.tea/entryFiles-production/index$.web.js

 require('@alipay/appx-compiler/lib/sjsEnvInit');
 require('./config$');
 
+require('../../components/mwSelectTimeModal/mwSelectTimeModal?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43');
 require('../../pages/index/index?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
 require('../../pages/place/place?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
-require('../../pages/createOrEditSchedule/createOrEditSchedule?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
+require('../../pages/createOrEditSchedule/createOrEditSchedule?hash=1050067ff0ee468be9456edefa2d7c5ad05c3cc7');
 require('../../pages/participantsDetail/participantsDetail?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');

.tea/entryFiles-production/index$.worker.js

@@ -54,9 +54,10 @@ if(AFAppX.registerApp) {
 
 function success() {
 require('../../app');
+require('../../components/mwSelectTimeModal/mwSelectTimeModal?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43');
 require('../../pages/index/index?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
 require('../../pages/place/place?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
-require('../../pages/createOrEditSchedule/createOrEditSchedule?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
+require('../../pages/createOrEditSchedule/createOrEditSchedule?hash=1050067ff0ee468be9456edefa2d7c5ad05c3cc7');
 require('../../pages/participantsDetail/participantsDetail?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
 }
 self.bootstrapApp ? self.bootstrapApp({ success }) : success();

.tea/layout.json

-<<<<<<< HEAD
-{"layout":{"left":{"currentId":"explorer","size":295},"right":{"currentId":""},"bottom":{"currentId":"devtools","size":266}},"storageVersion":"1.5.5"}
+{"layout":{"left":{"currentId":"explorer","size":310},"right":{"currentId":""},"bottom":{"currentId":""}},"storageVersion":"1.5.7"}
\ No newline at end of file
-=======
-{"layout":{"left":{"currentId":"explorer","size":330},"right":{"currentId":""},"bottom":{"currentId":"","size":280}},"storageVersion":"1.5.7"}
->>>>>>> 907505a0e30e08ac629232f61c09769fd862ca08

.tea/recent.json

-<<<<<<< HEAD
-{"OPENED_FILE":["file:///Users/ryousaku/Desktop/schedule/pages/createOrEditSchedule/createOrEditSchedule.js","file:///Users/ryousaku/Desktop/schedule/pages/createOrEditSchedule/createOrEditSchedule.axml","file:///Users/ryousaku/Desktop/schedule/components/mwSelectTimeModal/mwSelectTimeModal.js","file:///Users/ryousaku/Desktop/schedule/components/mwSelectTimeModal/mwSelectTimeModal.axml","file:///Users/ryousaku/Desktop/schedule/components/mwSelectTimeModal/mwSelectTimeModal.json","file:///Users/ryousaku/Desktop/schedule/pages/createOrEditSchedule/createOrEditSchedule.acss","file:///Users/ryousaku/Desktop/schedule/pages/createOrEditSchedule/createOrEditSchedule.json","file:///Users/ryousaku/Desktop/schedule/pages/createOrEditSchedule/createOrEditSchedule%202.axml","file:///Users/ryousaku/Desktop/schedule/components/mwSelectTimeModal/mwSelectTimeModal.acss","file:///Users/ryousaku/Desktop/schedule/mwSelectTimeModal/mwSelectTimeModal.js","file:///Users/ryousaku/Desktop/schedule/package-lock.json","file:///Users/ryousaku/Desktop/schedule/.gitignore","file:///Users/ryousaku/Desktop/schedule/app.acss","file:///Users/ryousaku/Desktop/schedule/app.js","file:///Users/ryousaku/Desktop/schedule/app.json","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/createOrEditSchedule/createOrEditSchedule.axml","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/participantsDetail/participantsDetail.acss","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/participantsDetail/participantsDetail.axml","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/createOrEditSchedule/createOrEditSchedule.acss","file:///Users/zhaoyufeng/Desktop/work/schedule/stores/exampleStore.js","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/participantsDetail/participantsDetail.js","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/createOrEditSchedule/createOrEditSchedule.js","file:///Users/zhaoyufeng/Desktop/work/schedule/app.js","file:///Users/zhaoyufeng/Desktop/work/schedule/.gitignore","file:///Users/zhaoyufeng/Desktop/work/schedule/stores/example","file:///Users/zhaoyufeng/Desktop/work/schedule/app.json","file:///Users/zhaoyufeng/Desktop/work/schedule/font/iconfont.acss","file:///Users/zhaoyufeng/Desktop/work/schedule/font/iconfont.svg","file:///Users/zhaoyufeng/Desktop/work/schedule/font/demo.acss","file:///Users/zhaoyufeng/Desktop/work/schedule/font/iconfont.ttf","file:///Users/zhaoyufeng/Desktop/work/schedule/font/iconfont.js","file:///Users/zhaoyufeng/Desktop/work/schedule/font/iconfont.eot","file:///Users/zhaoyufeng/Desktop/work/schedule/app.acss","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/index/index.axml","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/createOrEditSchedule/createOrEditSchedule.json","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/index/index.js","file:///Users/zhaoyufeng/Desktop/work/schedule/snapshot.png"],"SEARCH_WORD":["a:fo"],"storageVersion":"1.5.5"}
+{"OPENED_FILE":["file:///Users/zhaoyufeng/Desktop/work/schedule/app.js","file:///Users/zhaoyufeng/Desktop/work/schedule/assests/cancel.png","file:///Users/zhaoyufeng/Desktop/work/schedule/components/mwSelectTimeModal/mwSelectTimeModal.axml","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/createOrEditSchedule/createOrEditSchedule.js","file:///Users/zhaoyufeng/Desktop/work/schedule/stores/exampleStore.js","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/createOrEditSchedule/createOrEditSchedule.acss","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/place/place.axml","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/participantsDetail/participantsDetail.axml","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/createOrEditSchedule/createOrEditSchedule.axml","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/place/place.js","file:///Users/zhaoyufeng/Desktop/work/schedule/app.json","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/participantsDetail/participantsDetail.acss","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/participantsDetail/participantsDetail.js","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/place/place.acss","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/index/index.acss","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/index/index.axml","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/place/place.json","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/index/index.js","file:///Users/zhaoyufeng/Desktop/work/schedule/font/iconfont.acss","file:///Users/zhaoyufeng/Desktop/work/schedule/.gitignore","file:///Users/zhaoyufeng/Desktop/work/schedule/stores/example","file:///Users/zhaoyufeng/Desktop/work/schedule/font/iconfont.svg","file:///Users/zhaoyufeng/Desktop/work/schedule/font/demo.acss","file:///Users/zhaoyufeng/Desktop/work/schedule/font/iconfont.ttf","file:///Users/zhaoyufeng/Desktop/work/schedule/font/iconfont.js","file:///Users/zhaoyufeng/Desktop/work/schedule/font/iconfont.eot","file:///Users/zhaoyufeng/Desktop/work/schedule/app.acss","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/createOrEditSchedule/createOrEditSchedule.json","file:///Users/zhaoyufeng/Desktop/work/schedule/snapshot.png"],"SEARCH_WORD":["a:fo","border","debugger"],"storageVersion":"1.5.7"}
\ No newline at end of file
-=======
-{"OPENED_FILE":["file:///Users/zhaoyufeng/Desktop/work/schedule/stores/exampleStore.js","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/createOrEditSchedule/createOrEditSchedule.acss","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/place/place.axml","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/participantsDetail/participantsDetail.axml","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/createOrEditSchedule/createOrEditSchedule.axml","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/createOrEditSchedule/createOrEditSchedule.js","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/place/place.js","file:///Users/zhaoyufeng/Desktop/work/schedule/app.json","file:///Users/zhaoyufeng/Desktop/work/schedule/app.js","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/participantsDetail/participantsDetail.acss","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/participantsDetail/participantsDetail.js","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/place/place.acss","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/index/index.acss","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/index/index.axml","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/place/place.json","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/index/index.js","file:///Users/zhaoyufeng/Desktop/work/schedule/font/iconfont.acss","file:///Users/zhaoyufeng/Desktop/work/schedule/.gitignore","file:///Users/zhaoyufeng/Desktop/work/schedule/stores/example","file:///Users/zhaoyufeng/Desktop/work/schedule/font/iconfont.svg","file:///Users/zhaoyufeng/Desktop/work/schedule/font/demo.acss","file:///Users/zhaoyufeng/Desktop/work/schedule/font/iconfont.ttf","file:///Users/zhaoyufeng/Desktop/work/schedule/font/iconfont.js","file:///Users/zhaoyufeng/Desktop/work/schedule/font/iconfont.eot","file:///Users/zhaoyufeng/Desktop/work/schedule/app.acss","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/createOrEditSchedule/createOrEditSchedule.json","file:///Users/zhaoyufeng/Desktop/work/schedule/snapshot.png"],"SEARCH_WORD":["a:fo","border","debugger"],"storageVersion":"1.5.7"}
->>>>>>> 907505a0e30e08ac629232f61c09769fd862ca08

.tea/workbench.json

-<<<<<<< HEAD
-{"grid":{"editorGroup":{"uris":["file:///Users/zhaoyufeng/Desktop/work/schedule/pages/createOrEditSchedule/createOrEditSchedule.js","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/participantsDetail/participantsDetail.axml","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/participantsDetail/participantsDetail.acss","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/participantsDetail/participantsDetail.js","file:///Users/zhaoyufeng/Desktop/work/schedule/app.js","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/createOrEditSchedule/createOrEditSchedule.acss","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/createOrEditSchedule/createOrEditSchedule.axml","file:///Users/ryousaku/Desktop/schedule/app.json","file:///Users/ryousaku/Desktop/schedule/package-lock.json","file:///Users/ryousaku/Desktop/schedule/app.js","file:///Users/ryousaku/Desktop/schedule/app.acss","file:///Users/ryousaku/Desktop/schedule/.gitignore","file:///Users/ryousaku/Desktop/schedule/components/mwSelectTimeModal/mwSelectTimeModal.js","file:///Users/ryousaku/Desktop/schedule/components/mwSelectTimeModal/mwSelectTimeModal.acss","file:///Users/ryousaku/Desktop/schedule/components/mwSelectTimeModal/mwSelectTimeModal.axml","file:///Users/ryousaku/Desktop/schedule/components/mwSelectTimeModal/mwSelectTimeModal.json","file:///Users/ryousaku/Desktop/schedule/pages/createOrEditSchedule/createOrEditSchedule.json","file:///Users/ryousaku/Desktop/schedule/pages/createOrEditSchedule/createOrEditSchedule.axml","file:///Users/ryousaku/Desktop/schedule/pages/createOrEditSchedule/createOrEditSchedule.js","file:///Users/ryousaku/Desktop/schedule/pages/createOrEditSchedule/createOrEditSchedule.acss"],"current":"file:///Users/ryousaku/Desktop/schedule/pages/createOrEditSchedule/createOrEditSchedule.js","previewIndex":-1}},"storageVersion":"1.5.5"}
+{"grid":{"editorGroup":{"uris":["file:///Users/zhaoyufeng/Desktop/work/schedule/pages/createOrEditSchedule/createOrEditSchedule.js","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/createOrEditSchedule/createOrEditSchedule.axml","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/createOrEditSchedule/createOrEditSchedule.acss","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/place/place.js","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/place/place.axml","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/participantsDetail/participantsDetail.axml","file:///Users/zhaoyufeng/Desktop/work/schedule/stores/exampleStore.js","file:///Users/zhaoyufeng/Desktop/work/schedule/assests/cancel.png","file:///Users/zhaoyufeng/Desktop/work/schedule/app.js"],"current":"file:///Users/zhaoyufeng/Desktop/work/schedule/app.js","previewIndex":-1}},"storageVersion":"1.5.7"}
\ No newline at end of file
-=======
-{"grid":{"editorGroup":{"uris":["file:///Users/zhaoyufeng/Desktop/work/schedule/pages/createOrEditSchedule/createOrEditSchedule.js","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/createOrEditSchedule/createOrEditSchedule.axml","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/createOrEditSchedule/createOrEditSchedule.acss","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/place/place.js","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/place/place.axml","file:///Users/zhaoyufeng/Desktop/work/schedule/pages/participantsDetail/participantsDetail.axml","file:///Users/zhaoyufeng/Desktop/work/schedule/stores/exampleStore.js"],"current":"file:///Users/zhaoyufeng/Desktop/work/schedule/stores/exampleStore.js","previewIndex":-1}},"storageVersion":"1.5.7"}
->>>>>>> 907505a0e30e08ac629232f61c09769fd862ca08