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

# Conflicts:
#	watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/add_order.ftl

watero-rst-web/src/main/java/com/iamberry/rst/controllers/pts/AdminMachineController.java

@@ -687,7 +687,6 @@ public class AdminMachineController {
         }else{
             dateMonth = (char)(month + days);
         }
-        day = 25;
         if(day < 10){
             dateDay = (char)(day +'0');
         }else{