Merge branch 'sub_func' into dev

netflix-dao/src/main/java/com/cyksj/model/views/CpsApplyMoneyView.java

@@ -43,7 +43,7 @@ public class CpsApplyMoneyView {
 	@DbField("dma.type")
 	private DistributeMoneyApply.Type type;
 
-	@DbField("dma.type")
+	@DbField("dma.m_type")
 	private DistributeMoneyApply.MType mType;
 
 	@DbField("dma.account")