Lianxun_Java.git

old mode 100644 new mode 100755

			@@ -25,9 +25,11 @@
			<module>service-job</module>
			<module>service-common</module>
			<module>service-report</module>
			<module>service-front</module>
			<module>service-goods</module>
			<module>java110-generator</module>
			<module>service-acct</module>
			<module>service-oa</module>
			<module>service-dev</module>
			<module>service-busi-merge</module>

			</modules>

			@@ -99,7 +101,7 @@
			<dependency>
			<groupId>com.alibaba</groupId>
			<artifactId>fastjson</artifactId>
			<version>1.2.28</version>
			<version>1.2.69</version>
			</dependency>
			<dependency>
			<groupId>org.mybatis.spring.boot</groupId>
			@@ -490,6 +492,12 @@
			<artifactId>aliyun-sdk-oss</artifactId>
			<version>${oss.aliyun}</version>
			</dependency>

			<dependency>
			<groupId>com.alipay.sdk</groupId>
			<artifactId>alipay-sdk-java</artifactId>
			<version>4.10.111.ALL</version>
			</dependency>
			</dependencies>

			</dependencyManagement>
			@@ -498,7 +506,6 @@
			<dependency>
			<groupId>junit</groupId>
			<artifactId>junit</artifactId>
			<version>3.8.1</version>
			<scope>test</scope>
			</dependency>
			<dependency>
			@@ -529,7 +536,6 @@
			<plugin>
			<groupId>org.apache.maven.plugins</groupId>
			<artifactId>maven-javadoc-plugin</artifactId>
			<version>2.10.4</version>
			</plugin>
			<plugin>
			<groupId>org.apache.maven.plugins</groupId>
			@@ -540,7 +546,6 @@
			</plugin>
			<plugin>
			<artifactId>maven-source-plugin</artifactId>
			<version>3.0.1</version>
			<configuration>
			<attach>true</attach>
			</configuration>