Merge remote-tracking branch '惠信/develop' into develop
This commit is contained in:
commit
15f80717ab
|
|
@ -20,7 +20,7 @@ public class CmrAgentResultVO {
|
|||
/**
|
||||
* 代理商负责人信息(对象)
|
||||
*/
|
||||
private AgentManagerVO AgentHead1__r;
|
||||
private AgentManagerVO AgentHead1__r=new AgentManagerVO();
|
||||
|
||||
//SAP代理商客户号
|
||||
private String Agent_SAP__c;
|
||||
|
|
@ -35,7 +35,7 @@ public class CmrAgentResultVO {
|
|||
/**
|
||||
* 销售主管
|
||||
*/
|
||||
private AgentManagerVO SalesExecutive2__r;
|
||||
private AgentManagerVO SalesExecutive2__r=new AgentManagerVO();
|
||||
|
||||
//服务主管
|
||||
private String ServiceManager__c;
|
||||
|
|
@ -43,7 +43,7 @@ public class CmrAgentResultVO {
|
|||
/**
|
||||
* 服务主管
|
||||
*/
|
||||
private AgentManagerVO ServiceManager__r;
|
||||
private AgentManagerVO ServiceManager__r=new AgentManagerVO();
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -34,9 +34,9 @@ public class ControllerTest {
|
|||
|
||||
@Test
|
||||
public void testToken(){
|
||||
// customerService.syncFromCrm("2020-04-15","2020-04-15"); //2020-05-21
|
||||
String qu = UniqueSequenceGenerator.generateCode("QU");
|
||||
System.out.println(qu);
|
||||
customerService.syncFromCrm("2025-02-21","2025-02-22"); //2020-05-21
|
||||
// String qu = UniqueSequenceGenerator.generateCode("QU");
|
||||
// System.out.println(qu);
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue