Compare commits
	
		
			No commits in common. "de74a7b87d6fb5caa215c6d3dc2079daf033c8d3" and "2d51c2b60bc051a17794eb66163dc4cd8f944370" have entirely different histories.
		
	
	
		
			de74a7b87d
			...
			2d51c2b60b
		
	
		| 
						 | 
					@ -70,6 +70,7 @@
 | 
				
			||||||
        <result column="ALGEBRA" property="algebra"/>
 | 
					        <result column="ALGEBRA" property="algebra"/>
 | 
				
			||||||
        <result column="VERTEX_NAME" property="vertexName"/>
 | 
					        <result column="VERTEX_NAME" property="vertexName"/>
 | 
				
			||||||
        <result column="TEAM_NAME" property="teamName"/>
 | 
					        <result column="TEAM_NAME" property="teamName"/>
 | 
				
			||||||
 | 
					        <result column="ASSESS_STATUS" property="assessStatus"/>
 | 
				
			||||||
    </resultMap>
 | 
					    </resultMap>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    <sql id="CuMemberAchieveColumn">
 | 
					    <sql id="CuMemberAchieveColumn">
 | 
				
			||||||
| 
						 | 
					@ -180,7 +181,6 @@
 | 
				
			||||||
            mall_pv           NUMBER(17,6) default 0 not null
 | 
					            mall_pv           NUMBER(17,6) default 0 not null
 | 
				
			||||||
        )
 | 
					        )
 | 
				
			||||||
    </update>
 | 
					    </update>
 | 
				
			||||||
 | 
					 | 
				
			||||||
    <update id="mergeCuMemberMonth">
 | 
					    <update id="mergeCuMemberMonth">
 | 
				
			||||||
        merge into cu_member_month${date} a
 | 
					        merge into cu_member_month${date} a
 | 
				
			||||||
            using(
 | 
					            using(
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -12,7 +12,7 @@ public class SysConstants {
 | 
				
			||||||
    /**
 | 
					    /**
 | 
				
			||||||
     * 新零售前缀
 | 
					     * 新零售前缀
 | 
				
			||||||
     */
 | 
					     */
 | 
				
			||||||
    public static final String RETAIL_PREFIX = "BF";
 | 
					    public static final String RETAIL_PREFIX = "RE";
 | 
				
			||||||
    /**
 | 
					    /**
 | 
				
			||||||
     * 顶点
 | 
					     * 顶点
 | 
				
			||||||
     */
 | 
					     */
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -18,7 +18,7 @@ public enum EOrderPrefix {
 | 
				
			||||||
    /**
 | 
					    /**
 | 
				
			||||||
     * 销售订单
 | 
					     * 销售订单
 | 
				
			||||||
     */
 | 
					     */
 | 
				
			||||||
    ORDER_CODE("BFSO", "销售订单"),
 | 
					    ORDER_CODE("RESO", "销售订单"),
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    /**
 | 
					    /**
 | 
				
			||||||
     * 采购订单
 | 
					     * 采购订单
 | 
				
			||||||
| 
						 | 
					@ -73,7 +73,7 @@ public enum EOrderPrefix {
 | 
				
			||||||
    /**
 | 
					    /**
 | 
				
			||||||
     * 发货单
 | 
					     * 发货单
 | 
				
			||||||
     */
 | 
					     */
 | 
				
			||||||
    DELIVERY_CODE("BFSD", "发货单"),
 | 
					    DELIVERY_CODE("RESD", "发货单"),
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    /**
 | 
					    /**
 | 
				
			||||||
     * 充值
 | 
					     * 充值
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue