客户信息，添加修改页面，产品供应价格添加颜色69吗，方便查看

watero-rst-service/src/main/java/com/iamberry/rst/service/dm/mapper/dealerProductMapper.xml

@@ -21,6 +21,7 @@
         select
         <include refid="Base_List" />,
         pc.color_name,
+        pc.color_bar,
         pi.product_name
         from tb_rst_dm_dealer_product t
         LEFT JOIN tb_rst_product_color pc ON t.color_id = pc.color_id

watero-rst-web/src/main/webapp/WEB-INF/views/dm/dealer/add_dealer.ftl

@@ -189,6 +189,7 @@
                         <tr class="text-c" id="table1">
                             <th style="text-align: center;" width="30" >产品名称</th>
                             <th style="text-align: center;" width="30" >产品颜色</th>
+                            <th style="text-align: center;" width="30" >69码</th>
                             <th style="text-align: center;" width="10">供应价格</th>
                             <th style="text-align: center;" width="10">供应渠道对象</th>
                             <th style="text-align: center;" width="5">操作</th>

watero-rst-web/src/main/webapp/WEB-INF/views/dm/dealer/add_dealer_product.ftl

@@ -307,6 +307,7 @@
                     dealerProduct.colorId=v.colorId;
                     dealerProduct.productName=v.productName;
                     dealerProduct.colorName=v.colorName;
+                    dealerProduct.colorBar=v.colorBar;
                     var dealProdStoreArea = $("input[name=dealProdStoreArea]:checked").val();
                     dealerProduct.dealProdStoreArea=dealProdStoreArea;
                     if(dealProdStoreArea == 2){

watero-rst-web/src/main/webapp/WEB-INF/views/dm/dealer/update_dealer.ftl

@@ -226,6 +226,7 @@
                         <tr class="text-c" id="table1">
                             <th style="text-align: center;" width="30" >产品名称</th>
                             <th style="text-align: center;" width="30" >产品颜色</th>
+                            <th style="text-align: center;" width="30" >69码</th>
                             <th style="text-align: center;" width="10">供应价格</th>
                             <th style="text-align: center;" width="10">供应渠道对象</th>
                             <th style="text-align: center;" width="5">操作</th>
@@ -243,6 +244,7 @@
                                         <input type="hidden" class="input-text dealerProductStoreIds" value="${dealerProduct.dealerProductStoreIds!''}" >
                                         <td class="productName">${dealerProduct.productName!''}</td>
                                         <td class="colorName">${dealerProduct.colorName!''}</td>
+                                        <td class="colorName">${dealerProduct.colorBar!''}</td>
                                         <td>
                                             <input type="text" style="text-align: center;" class="input-text input-number decimal_input dealProdPrice" value="${((dealerProduct.dealProdPrice/100)?string("0.##"))!''}"   onkeyup="keyFunDecimal($(this),9999999,0)" myMinVal="0" myMaxVal="9999999">
                                         </td>

watero-rst-web/src/main/webapp/common/js/dealer/dealer.js

@@ -186,6 +186,7 @@ function showDealerProduct(dealerProductArray) {
             html += ' <input type="hidden" class="input-text dealerProductStoreIds" value="'+ cufte(obj.dealerProductStoreIds) +'" >';
             html += '<td class="productName">'+ cufte(obj.productName) +'</td>';
             html += '<td class="colorName">'+ cufte(obj.colorName) +'</td>';
+            html += '<td class="colorName">'+ cufte(obj.colorBar) +'</td>';
             html += '<td><input type="text" style="text-align: center;" class="input-text input-number dealProdPrice" value="'+ cufte(obj.dealProdPrice) +'"   onkeyup="keyFun($(this),99999,0)" onpaste="keyFun($(this),99999,0)"></td>';
             if(obj.dealProdStoreArea == 1){
                 html += '<td class="dealerProductStoreName">全部店铺</td>';