haicaojie.git - Gitblit

parent: c67d216e | 补丁 | 提交 | ignore whitespace

Merge branch 'master' of ssh://193.112.35.168:29418/haicaojie

重庆迈尖科技有限公司

2018-08-13 26594dde7b569487fb5326f96619b2a174bf561d

Merge branch 'master' of ssh://193.112.35.168:29418/haicaojie

# Conflicts:
#	MIduo.xcworkspace/xcuserdata/mj.xcuserdatad/UserInterfaceState.xcuserstate

2个文件已修改

	MIduo.xcworkspace/xcuserdata/mj.xcuserdatad/UserInterfaceState.xcuserstate	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	MIduo/数据/DataNet/JYNetWorking.m	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 MIduo.xcworkspace/xcuserdata/mj.xcuserdatad/UserInterfaceState.xcuserstate

Binary files differ

 MIduo/数据/DataNet/JYNetWorking.m

@@ -73,6 +73,10 @@
            }else{
                [YTHsharedManger startManger].isMainOrDynamic = NO;
            }
            if (error.code == -1004) {
                [YTHsharedManger startManger].isCheckNetCanUse = -2;

            }
            
        }
    }];

			@@ -73,6 +73,10 @@
			}else{
			[YTHsharedManger startManger].isMainOrDynamic = NO;
			}
			if (error.code == -1004) {
			[YTHsharedManger startManger].isCheckNetCanUse = -2;

			}

			}
			}];