Merge branch 'master' into csc

Demo

2024-07-17 3a9b5dcd5dd6ed033f80f1696b07135635b3e9f8

 HTML/views/BaseSetting/CustomerFrom.html

@@ -34,6 +34,7 @@
                  <option value=""></option>
                  <option value="0">客户</option>
                  <option value="1">供应商</option>
                  <option value="2">货主</option>
               </select>
            </div>
         </div>