Merge branch 'dev' of ssh://10.10.100.21/source/saas-platform into dev

applications/document/document-dto/src/main/java/com.usoftchina.saas.document.dto/CustomerDTO.java

@@ -42,12 +42,6 @@ public class CustomerDTO extends CommonBaseDTO implements Serializable {
 
     private String cu_statuscode;
 
-    private Integer cu_recordmanid;
-
-    private String cu_recordman;
-
-    private Date cu_recorddate;
-
     private String cu_text1;
 
     private String cu_text2;

applications/document/document-dto/src/main/java/com/usoftchina/saas/document/entities/Customer.java

@@ -38,12 +38,6 @@ public class Customer extends CommonBaseEntity implements Serializable {
 
     private String cu_statuscode;
 
-    private Integer cu_recordmanid;
-
-    private String cu_recordman;
-
-    private Date cu_recorddate;
-
     private String cu_text1;
 
     private String cu_text2;
@@ -60,211 +54,4 @@ public class Customer extends CommonBaseEntity implements Serializable {
 
     private Double cu_preamount;
 
-    public String getCu_code() {
-        return cu_code;
-    }
-
-    public void setCu_code(String cu_code) {
-        this.cu_code = cu_code;
-    }
-
-    public String getCu_name() {
-        return cu_name;
-    }
-
-    public void setCu_name(String cu_name) {
-        this.cu_name = cu_name;
-    }
-
-    public String getCu_uu() {
-        return cu_uu;
-    }
-
-    public void setCu_uu(String cu_uu) {
-        this.cu_uu = cu_uu;
-    }
-
-    public String getCu_type() {
-        return cu_type;
-    }
-
-    public void setCu_type(String cu_type) {
-        this.cu_type = cu_type;
-    }
-
-    public Date getCu_begindate() {
-        return cu_begindate;
-    }
-
-    public void setCu_begindate(Date cu_begindate) {
-        this.cu_begindate = cu_begindate;
-    }
-
-    public Double getCu_beginaramount() {
-        return cu_beginaramount;
-    }
-
-    public void setCu_beginaramount(Double cu_beginaramount) {
-        this.cu_beginaramount = cu_beginaramount;
-    }
-
-    public Double getCu_beginprerecamount() {
-        return cu_beginprerecamount;
-    }
-
-    public void setCu_beginprerecamount(Double cu_beginprerecamount) {
-        this.cu_beginprerecamount = cu_beginprerecamount;
-    }
-
-    public Double getCu_promisedays() {
-        return cu_promisedays;
-    }
-
-    public void setCu_promisedays(Double cu_promisedays) {
-        this.cu_promisedays = cu_promisedays;
-    }
-
-    public Double getCu_taxrate() {
-        return cu_taxrate;
-    }
-
-    public void setCu_taxrate(Double cu_taxrate) {
-        this.cu_taxrate = cu_taxrate;
-    }
-
-    public Integer getCu_sellerid() {
-        return cu_sellerid;
-    }
-
-    public void setCu_sellerid(Integer cu_sellerid) {
-        this.cu_sellerid = cu_sellerid;
-    }
-
-    public String getCu_sellercode() {
-        return cu_sellercode;
-    }
-
-    public void setCu_sellercode(String cu_sellercode) {
-        this.cu_sellercode = cu_sellercode;
-    }
-
-    public String getCu_sellername() {
-        return cu_sellername;
-    }
-
-    public void setCu_sellername(String cu_sellername) {
-        this.cu_sellername = cu_sellername;
-    }
-
-    public Double getCu_credit() {
-        return cu_credit;
-    }
-
-    public void setCu_credit(Double cu_credit) {
-        this.cu_credit = cu_credit;
-    }
-
-    public String getCu_status() {
-        return cu_status;
-    }
-
-    public void setCu_status(String cu_status) {
-        this.cu_status = cu_status;
-    }
-
-    public String getCu_statuscode() {
-        return cu_statuscode;
-    }
-
-    public void setCu_statuscode(String cu_statuscode) {
-        this.cu_statuscode = cu_statuscode;
-    }
-
-    public Integer getCu_recordmanid() {
-        return cu_recordmanid;
-    }
-
-    public void setCu_recordmanid(Integer cu_recordmanid) {
-        this.cu_recordmanid = cu_recordmanid;
-    }
-
-    public String getCu_recordman() {
-        return cu_recordman;
-    }
-
-    public void setCu_recordman(String cu_recordman) {
-        this.cu_recordman = cu_recordman;
-    }
-
-    public Date getCu_recorddate() {
-        return cu_recorddate;
-    }
-
-    public void setCu_recorddate(Date cu_recorddate) {
-        this.cu_recorddate = cu_recorddate;
-    }
-
-    public String getCu_text1() {
-        return cu_text1;
-    }
-
-    public void setCu_text1(String cu_text1) {
-        this.cu_text1 = cu_text1;
-    }
-
-    public String getCu_text2() {
-        return cu_text2;
-    }
-
-    public void setCu_text2(String cu_text2) {
-        this.cu_text2 = cu_text2;
-    }
-
-    public String getCu_text3() {
-        return cu_text3;
-    }
-
-    public void setCu_text3(String cu_text3) {
-        this.cu_text3 = cu_text3;
-    }
-
-    public String getCu_text4() {
-        return cu_text4;
-    }
-
-    public void setCu_text4(String cu_text4) {
-        this.cu_text4 = cu_text4;
-    }
-
-    public String getCu_text5() {
-        return cu_text5;
-    }
-
-    public void setCu_text5(String cu_text5) {
-        this.cu_text5 = cu_text5;
-    }
-
-    public Double getCu_leftamount() {
-        return cu_leftamount;
-    }
-
-    public void setCu_leftamount(Double cu_leftamount) {
-        this.cu_leftamount = cu_leftamount;
-    }
-
-    public Double getCu_recamount() {
-        return cu_recamount;
-    }
-
-    public void setCu_recamount(Double cu_recamount) {
-        this.cu_recamount = cu_recamount;
-    }
-
-    public Double getCu_preamount() {
-        return cu_preamount;
-    }
-
-    public void setCu_preamount(Double cu_preamount) {
-        this.cu_preamount = cu_preamount;
-    }
 }

applications/document/document-dto/src/main/java/com/usoftchina/saas/document/entities/CustomerList.java

@@ -43,12 +43,6 @@ public class CustomerList extends CommonBaseEntity{
 
     private String cu_statuscode;
 
-    private Integer cu_recordmanid;
-
-    private String cu_recordman;
-
-    private Date cu_recorddate;
-
     private String cu_text1;
 
     private String cu_text2;

applications/document/document-server/src/main/resources/mapper/CustomerListMapper.xml

@@ -18,9 +18,6 @@
     <result column="cu_credit" jdbcType="DOUBLE" property="cu_credit" />
     <result column="cu_status" jdbcType="VARCHAR" property="cu_status" />
     <result column="cu_statuscode" jdbcType="VARCHAR" property="cu_statuscode" />
-    <result column="cu_recordmanid" jdbcType="INTEGER" property="cu_recordmanid" />
-    <result column="cu_recordman" jdbcType="VARCHAR" property="cu_recordman" />
-    <result column="cu_recorddate" jdbcType="TIMESTAMP" property="cu_recorddate" />
     <result column="cu_leftamount" jdbcType="DOUBLE" property="cu_leftamount" />
     <result column="cu_recamount" jdbcType="DOUBLE" property="cu_recamount" />
     <result column="cu_preamount" jdbcType="DOUBLE" property="cu_preamount" />

applications/document/document-server/src/main/resources/mapper/CustomerMapper.xml

@@ -18,9 +18,6 @@
     <result column="cu_credit" jdbcType="DOUBLE" property="cu_credit" />
     <result column="cu_status" jdbcType="VARCHAR" property="cu_status" />
     <result column="cu_statuscode" jdbcType="VARCHAR" property="cu_statuscode" />
-    <result column="cu_recordmanid" jdbcType="INTEGER" property="cu_recordmanid" />
-    <result column="cu_recordman" jdbcType="VARCHAR" property="cu_recordman" />
-    <result column="cu_recorddate" jdbcType="TIMESTAMP" property="cu_recorddate" />
     <result column="companyid" jdbcType="INTEGER" property="companyId" />
     <result column="updaterid" jdbcType="INTEGER" property="updaterId" />
     <result column="updatetime" jdbcType="TIMESTAMP" property="updateTime" />
@@ -36,7 +33,7 @@
   <sql id="Base_Column_List">
     cu_id, cu_code, cu_name, cu_uu, cu_type, cu_begindate, cu_beginaramount, cu_beginprerecamount, 
     cu_promisedays, cu_taxrate, cu_sellerid, cu_sellercode, cu_sellername, cu_credit, 
-    cu_status, cu_statuscode, cu_recordmanid, cu_recordman, cu_recorddate, companyid, 
+    cu_status, cu_statuscode, companyid,
     updaterid, updatetime, cu_text1, cu_text2, cu_text3, cu_text4, cu_text5, cu_leftamount, 
     cu_recamount,cu_preamount
   </sql>
@@ -102,15 +99,6 @@
       <if test="cu_statuscode != null">
         cu_statuscode,
       </if>
-      <if test="cu_recordmanid != null">
-        cu_recordmanid,
-      </if>
-      <if test="cu_recordman != null">
-        cu_recordman,
-      </if>
-      <if test="cu_recorddate != null">
-        cu_recorddate,
-      </if>
       <if test="companyId != null">
         companyid,
       </if>
@@ -192,15 +180,6 @@
       <if test="cu_statuscode != null">
         #{cu_statuscode,jdbcType=VARCHAR},
       </if>
-      <if test="cu_recordmanid != null">
-        #{cu_recordmanid,jdbcType=INTEGER},
-      </if>
-      <if test="cu_recordman != null">
-        #{cu_recordman,jdbcType=VARCHAR},
-      </if>
-      <if test="cu_recorddate != null">
-        #{cu_recorddate,jdbcType=TIMESTAMP},
-      </if>
       <if test="companyId != null">
         #{companyId,jdbcType=INTEGER},
       </if>
@@ -284,15 +263,6 @@
       <if test="cu_statuscode != null">
         cu_statuscode = #{cu_statuscode,jdbcType=VARCHAR},
       </if>
-      <if test="cu_recordmanid != null">
-        cu_recordmanid = #{cu_recordmanid,jdbcType=INTEGER},
-      </if>
-      <if test="cu_recordman != null">
-        cu_recordman = #{cu_recordman,jdbcType=VARCHAR},
-      </if>
-      <if test="cu_recorddate != null">
-        cu_recorddate = #{cu_recorddate,jdbcType=TIMESTAMP},
-      </if>
       <if test="companyId != null">
         companyid = #{companyId,jdbcType=INTEGER},
       </if>
@@ -346,9 +316,6 @@
       cu_credit = #{cu_credit,jdbcType=DOUBLE},
       cu_status = #{cu_status,jdbcType=VARCHAR},
       cu_statuscode = #{cu_statuscode,jdbcType=VARCHAR},
-      cu_recordmanid = #{cu_recordmanid,jdbcType=INTEGER},
-      cu_recordman = #{cu_recordman,jdbcType=VARCHAR},
-      cu_recorddate = #{cu_recorddate,jdbcType=TIMESTAMP},
       companyid = #{companyid,jdbcType=INTEGER},
       updaterid = #{updaterid,jdbcType=INTEGER},
       updatetime = #{updatetime,jdbcType=TIMESTAMP},