Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

# Conflicts:
#	watero-rst-web/src/main/java/com/iamberry/rst/controllers/pts/AdminMachineController.java
#	watero-rst-web/src/main/webapp/WEB-INF/views/pts/machine/addRenovationMachine.ftl

watero-rst-web/src/main/webapp/WEB-INF/views/pts/machine/addRenovationMachine.ftl

@@ -52,7 +52,8 @@
 						<#else >
                             <option value ="">暂无批次，请先添加批次</option>
 						</#if>
-				</select>
+				</select><br>
+                <span style="margin-left: 15.5%">请对照生产计划部给到的纸制生产计划信息。</span>
             </div>
         <div class="input-box">
             <span class="input-dic spanhidth">软件版本:</span>