发生地方
Merge branch 'master' of https://github.com/alexfz420/DSG.git

Conflicts:
	DSG/WebContent/Edit_TemplateCostCalculation.jsp
	DSG/WebContent/RuleList.jsp
	DSG/WebContent/placeOrder.jsp
	DSG/src/com/dicks/engine/CreateTemplate.java
	DSG/src/com/dicks/engine/WriteDrl.java
	DSG/src/com/dicks/pojo/Rule.java
	DSG/src/com/dicks/rules/newRule_joe.drl
	DSG/src/struts.xml